Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove MicrosoftAPIFaceEmotionExtractor #471

Merged
merged 1 commit into from
Sep 2, 2022
Merged

Remove MicrosoftAPIFaceEmotionExtractor #471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion docs/_includes/_replacements.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
.. |ZeroCrossingRateExtractor| replace:: :py:class:`ZeroCrossingRateExtractor`
.. |BrightnessExtractor| replace:: :py:class:`BrightnessExtractor`
.. |MicrosoftAPIFaceExtractor| replace:: :py:class:`MicrosoftAPIFaceExtractor`
.. |MicrosoftAPIFaceEmotionExtractor| replace:: :py:class:`MicrosoftAPIFaceEmotionExtractor`
.. |MicrosoftVisionAPIExtractor| replace:: :py:class:`MicrosoftVisionAPIExtractor`
.. |MicrosoftVisionAPITagExtractor| replace:: :py:class:`MicrosoftVisionAPITagExtractor`
.. |MicrosoftVisionAPICategoryExtractor| replace:: :py:class:`MicrosoftVisionAPICategoryExtractor`
Expand Down
2 changes: 1 addition & 1 deletion docs/reference.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ Extractors (:mod:`pliers.extractors`)
GoogleVisionAPISafeSearchExtractor
GoogleVisionAPIWebEntitiesExtractor
MicrosoftAPIFaceExtractor
MicrosoftAPIFaceEmotionExtractor

MicrosoftVisionAPIExtractor
MicrosoftVisionAPITagExtractor
MicrosoftVisionAPICategoryExtractor
Expand Down
1 change: 0 additions & 1 deletion docs/transformers.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ At present, pliers implements several dozen |Extractor| classes that span a wide
GoogleVisionAPISafeSearchExtractor
GoogleVisionAPIWebEntitiesExtractor
MicrosoftAPIFaceExtractor
MicrosoftAPIFaceEmotionExtractor
MicrosoftVisionAPIExtractor
MicrosoftVisionAPITagExtractor
MicrosoftVisionAPICategoryExtractor
Expand Down
2 changes: 0 additions & 2 deletions pliers/extractors/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
GoogleLanguageAPITextCategoryExtractor,
GoogleLanguageAPIEntitySentimentExtractor,
MicrosoftAPIFaceExtractor,
MicrosoftAPIFaceEmotionExtractor,
MicrosoftVisionAPIExtractor,
MicrosoftVisionAPITagExtractor,
MicrosoftVisionAPICategoryExtractor,
Expand Down Expand Up @@ -119,7 +118,6 @@
'FaceRecognitionFaceLandmarksExtractor',
'FaceRecognitionFaceLocationsExtractor',
'MicrosoftAPIFaceExtractor',
'MicrosoftAPIFaceEmotionExtractor',
'MicrosoftVisionAPIExtractor',
'MicrosoftVisionAPITagExtractor',
'MicrosoftVisionAPICategoryExtractor',
Expand Down
2 changes: 0 additions & 2 deletions pliers/extractors/api/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
GoogleLanguageAPITextCategoryExtractor,
GoogleLanguageAPIEntitySentimentExtractor)
from .microsoft import (MicrosoftAPIFaceExtractor,
MicrosoftAPIFaceEmotionExtractor,
MicrosoftVisionAPIExtractor,
MicrosoftVisionAPITagExtractor,
MicrosoftVisionAPICategoryExtractor,
Expand All @@ -43,7 +42,6 @@
'GoogleLanguageAPITextCategoryExtractor',
'GoogleLanguageAPIEntitySentimentExtractor',
'MicrosoftAPIFaceExtractor',
'MicrosoftAPIFaceEmotionExtractor',
'MicrosoftVisionAPIExtractor',
'MicrosoftVisionAPITagExtractor',
'MicrosoftVisionAPICategoryExtractor',
Expand Down
18 changes: 0 additions & 18 deletions pliers/extractors/api/microsoft.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,24 +101,6 @@ def _to_df(self, result):

return pd.DataFrame(face_results)


class MicrosoftAPIFaceEmotionExtractor(MicrosoftAPIFaceExtractor):

''' Extracts facial emotions from images using the Microsoft API '''

def __init__(self, face_id=False, rectangle=False, landmarks=False,
subscription_key=None, location=None, api_version='v1.0',
rate_limit=None):
super().__init__(face_id,
rectangle,
landmarks,
['emotion'],
subscription_key=subscription_key,
location=location,
api_version=api_version,
rate_limit=rate_limit)


class MicrosoftVisionAPIExtractor(MicrosoftVisionAPITransformer,
ImageExtractor):
''' Base MicrosoftVisionAPIExtractor class.
Expand Down
21 changes: 0 additions & 21 deletions pliers/tests/extractors/api/test_microsoft_extractors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

from pliers import config
from pliers.extractors import (MicrosoftAPIFaceExtractor,
MicrosoftAPIFaceEmotionExtractor,
MicrosoftVisionAPIExtractor,
MicrosoftVisionAPITagExtractor,
MicrosoftVisionAPICategoryExtractor,
Expand Down Expand Up @@ -44,26 +43,6 @@ def test_microsoft_api_face_extractor():
assert 'face_gender' in res.columns
assert res['face_gender'][0] == 'female'


@pytest.mark.requires_payment
@pytest.mark.skipif("'MICROSOFT_FACE_SUBSCRIPTION_KEY' not in os.environ")
def test_microsoft_api_face_emotion_extractor():
ext = MicrosoftAPIFaceEmotionExtractor()
img = ImageStim(join(IMAGE_DIR, 'obama.jpg'))
res = ext.transform(img).to_df(timing=False, object_id=False)
assert res.shape == (1, 8)
assert res['face_emotion_happiness'][0] > 0.5
assert res['face_emotion_anger'][0] < 0.5

ext = MicrosoftAPIFaceEmotionExtractor(subscription_key='nogood')
assert not ext.validate_keys()
default = config.get_option('api_key_validation')
config.set_option('api_key_validation', True)
with pytest.raises(ValueError):
ext.transform(img)
config.set_option('api_key_validation', default)


@pytest.mark.requires_payment
@pytest.mark.skipif("'MICROSOFT_VISION_SUBSCRIPTION_KEY' not in os.environ")
def test_microsoft_vision_api_extractor():
Expand Down