Skip to content

Commit

Permalink
put imports in conventional order
Browse files Browse the repository at this point in the history
  • Loading branch information
tyarkoni committed Apr 27, 2020
1 parent ecf97a3 commit 6d2ee55
Show file tree
Hide file tree
Showing 62 changed files with 250 additions and 147 deletions.
7 changes: 4 additions & 3 deletions pliers/converters/api/ibm.py
Expand Up @@ -4,13 +4,14 @@
import base64
import json
import logging
from urllib.parse import urlencode
from urllib.request import Request, urlopen
from urllib.error import URLError, HTTPError

from pliers.stimuli.text import TextStim, ComplexTextStim
from pliers.utils import attempt_to_import, verify_dependencies
from pliers.converters.audio import AudioToTextConverter
from pliers.transformers.api import APITransformer
from urllib.parse import urlencode
from urllib.request import Request, urlopen
from urllib.error import URLError, HTTPError

sr = attempt_to_import('speech_recognition', 'sr')

Expand Down
5 changes: 3 additions & 2 deletions pliers/converters/api/wit.py
Expand Up @@ -3,12 +3,13 @@
import logging
import os
from abc import abstractproperty
from urllib.request import Request, urlopen
from urllib.error import HTTPError

from pliers.stimuli.text import ComplexTextStim
from pliers.utils import attempt_to_import, verify_dependencies
from pliers.converters.audio import AudioToTextConverter
from pliers.transformers.api import APITransformer
from urllib.request import Request, urlopen
from urllib.error import HTTPError

sr = attempt_to_import('speech_recognition', 'sr')

Expand Down
3 changes: 2 additions & 1 deletion pliers/converters/base.py
@@ -1,11 +1,12 @@
''' Base Converter class and utilities. '''

from abc import ABCMeta, abstractmethod, abstractproperty
import inspect

from pliers.transformers import Transformer
from pliers.utils import listify, EnvironmentKeyMixin
from pliers import config
import pliers
import inspect


class Converter(Transformer, metaclass=ABCMeta):
Expand Down
3 changes: 2 additions & 1 deletion pliers/converters/image.py
@@ -1,10 +1,11 @@
''' Converter classes that operate on ImageStim inputs. '''

from PIL import Image
from .base import Converter

from pliers.stimuli.image import ImageStim
from pliers.stimuli.text import TextStim
from pliers.utils import attempt_to_import, verify_dependencies
from .base import Converter

pytesseract = attempt_to_import('pytesseract')

Expand Down
5 changes: 4 additions & 1 deletion pliers/extractors/api/clarifai.py
Expand Up @@ -5,13 +5,16 @@
import logging
import os
from contextlib import ExitStack

import pandas as pd

from pliers.extractors.image import ImageExtractor
from pliers.extractors.video import VideoExtractor
from pliers.extractors.base import ExtractorResult
from pliers.transformers import BatchTransformerMixin
from pliers.transformers.api import APITransformer
from pliers.utils import listify, attempt_to_import, verify_dependencies
import pandas as pd


clarifai_client = attempt_to_import('clarifai.rest.client', 'clarifai_client',
['ClarifaiApp',
Expand Down
16 changes: 9 additions & 7 deletions pliers/extractors/api/google.py
@@ -1,5 +1,14 @@
''' Google API-based feature extraction classes. '''

import logging
import time
import warnings
import os
from collections import defaultdict

import numpy as np
import pandas as pd

from pliers.extractors.image import ImageExtractor
from pliers.extractors.text import TextExtractor
from pliers.extractors.video import VideoExtractor
Expand All @@ -8,13 +17,6 @@
GoogleAPITransformer)
from pliers.extractors.base import ExtractorResult
from pliers.utils import flatten_dict
import numpy as np
import pandas as pd
import logging
import time
import warnings
import os
from collections import defaultdict


class GoogleVisionAPIExtractor(GoogleVisionAPITransformer, ImageExtractor):
Expand Down
4 changes: 2 additions & 2 deletions pliers/extractors/api/microsoft.py
Expand Up @@ -2,13 +2,13 @@
Extractors that interact with Microsoft Azure Cognitive Services API.
'''

import pandas as pd

from pliers.extractors.base import ExtractorResult
from pliers.extractors.image import ImageExtractor
from pliers.transformers import (MicrosoftAPITransformer,
MicrosoftVisionAPITransformer)

import pandas as pd


class MicrosoftAPIFaceExtractor(MicrosoftAPITransformer, ImageExtractor):
''' Extracts face features (location, emotion, accessories, etc.). From an
Expand Down
19 changes: 11 additions & 8 deletions pliers/extractors/audio.py
@@ -1,18 +1,21 @@
''' Extractors that operate on AudioStim inputs. '''

from abc import ABCMeta
from os import path
import sys
import logging

import numpy as np
from scipy import fft
import pandas as pd
import soundfile as sf

from pliers.stimuli.audio import AudioStim
from pliers.stimuli.text import ComplexTextStim
from pliers.extractors.base import Extractor, ExtractorResult
from pliers.utils import attempt_to_import, verify_dependencies, listify
from pliers.support.exceptions import MissingDependencyError
from pliers.support.setup_yamnet import YAMNET_PATH
import numpy as np
from scipy import fft
import pandas as pd
import soundfile as sf
from abc import ABCMeta
from os import path
import sys
import logging

librosa = attempt_to_import('librosa')
tf = attempt_to_import('tensorflow')
Expand Down
6 changes: 4 additions & 2 deletions pliers/extractors/base.py
@@ -1,12 +1,14 @@
''' Base Extractor class and associated functionality. '''

from abc import ABCMeta, abstractmethod
import json

import pandas as pd
import numpy as np
from pandas.api.types import is_numeric_dtype

from pliers.transformers import Transformer
from pliers.utils import isgenerator, flatten, listify
from pandas.api.types import is_numeric_dtype
import json


class Extractor(Transformer, metaclass=ABCMeta):
Expand Down
9 changes: 5 additions & 4 deletions pliers/extractors/image.py
Expand Up @@ -2,14 +2,15 @@
Extractors that operate primarily or exclusively on Image stimuli.
'''

from functools import partial

import numpy as np
import pandas as pd

from pliers.stimuli.image import ImageStim
from pliers.extractors.base import Extractor, ExtractorResult
from pliers.utils import attempt_to_import, verify_dependencies, listify
from pliers.support.due import due, Url, Doi
import numpy as np
import pandas as pd
from functools import partial


cv2 = attempt_to_import('cv2')
face_recognition = attempt_to_import('face_recognition')
Expand Down
2 changes: 1 addition & 1 deletion pliers/extractors/models.py
@@ -1,12 +1,12 @@
''' Extractor classes based on pre-trained models. '''

import numpy as np

from pliers.extractors.image import ImageExtractor
from pliers.extractors.base import ExtractorResult
from pliers.filters.image import ImageResizingFilter
from pliers.utils import attempt_to_import, verify_dependencies


tf = attempt_to_import('tensorflow')
attempt_to_import('tensorflow.keras')

Expand Down
16 changes: 9 additions & 7 deletions pliers/extractors/text.py
Expand Up @@ -2,6 +2,15 @@
Extractors that operate primarily or exclusively on Text stimuli.
'''
import sys
import itertools
import logging

import numpy as np
import pandas as pd
import scipy
import nltk
from nltk.sentiment.vader import SentimentIntensityAnalyzer

from pliers.stimuli.text import TextStim, ComplexTextStim
from pliers.extractors.base import Extractor, ExtractorResult
from pliers.support.exceptions import PliersError
Expand All @@ -10,13 +19,6 @@
from pliers.transformers import BatchTransformerMixin
from pliers.utils import (attempt_to_import, verify_dependencies, flatten,
listify)
import itertools
import numpy as np
import pandas as pd
import scipy
import nltk
from nltk.sentiment.vader import SentimentIntensityAnalyzer
import logging


keyedvectors = attempt_to_import('gensim.models.keyedvectors', 'keyedvectors',
Expand Down
4 changes: 2 additions & 2 deletions pliers/extractors/video.py
Expand Up @@ -2,12 +2,12 @@
Extractors that operate primarily or exclusively on Video stimuli.
'''

import numpy as np

from pliers.stimuli.video import VideoStim
from pliers.extractors.base import Extractor, ExtractorResult
from pliers.utils import attempt_to_import, verify_dependencies

import numpy as np

cv2 = attempt_to_import('cv2')


Expand Down
3 changes: 2 additions & 1 deletion pliers/filters/audio.py
@@ -1,9 +1,10 @@
''' Filters that operate on TextStim inputs. '''

from copy import deepcopy

from pliers.stimuli import AudioStim
from pliers.utils import attempt_to_import, verify_dependencies
from .base import Filter, TemporalTrimmingFilter
from copy import deepcopy

librosa = attempt_to_import('librosa')

Expand Down
4 changes: 2 additions & 2 deletions pliers/filters/base.py
@@ -1,12 +1,12 @@
''' Base Filter class and associated functionality. '''

from abc import ABCMeta, abstractmethod
import logging

from pliers.stimuli import AudioStim, VideoStim
from pliers.transformers import Transformer
from pliers.utils import listify

import logging


class Filter(Transformer, metaclass=ABCMeta):
''' Base class for Filters.'''
Expand Down
6 changes: 3 additions & 3 deletions pliers/filters/image.py
@@ -1,11 +1,11 @@
''' Filters that operate on ImageStim inputs. '''

from pliers.stimuli.image import ImageStim
import numpy as np
from PIL import Image
from PIL import ImageFilter as PillowFilter
from .base import Filter

import numpy as np
from pliers.stimuli.image import ImageStim
from .base import Filter


class ImageFilter(Filter):
Expand Down
3 changes: 2 additions & 1 deletion pliers/filters/text.py
@@ -1,13 +1,14 @@
''' Filters that operate on TextStim inputs. '''

import nltk
import string
import re

import nltk
from nltk import stem
from nltk.tokenize import word_tokenize
from nltk.tokenize import * # noqa
from nltk.tokenize.api import TokenizerI

from pliers.stimuli.text import TextStim
from pliers.support.decorators import requires_nltk_corpus
from .base import Filter
Expand Down
5 changes: 2 additions & 3 deletions pliers/filters/video.py
@@ -1,12 +1,11 @@
''' Filters that operate on TextStim inputs. '''

import numpy as np

from pliers.stimuli.video import VideoStim, VideoFrameCollectionStim
from pliers.utils import attempt_to_import, verify_dependencies
from .base import Filter, TemporalTrimmingFilter

import numpy as np


cv2 = attempt_to_import('cv2')


Expand Down
7 changes: 3 additions & 4 deletions pliers/graph.py
@@ -1,15 +1,14 @@
''' The `graph` module contains tools for constructing and executing graphs
of pliers Transformers. '''
from itertools import chain
from collections import OrderedDict
import json

from pliers.extractors.base import merge_results
from pliers.stimuli import __all__ as stim_list
from pliers.transformers import get_transformer
from pliers.utils import (listify, flatten, isgenerator, attempt_to_import,
verify_dependencies)
from itertools import chain
from collections import OrderedDict

import json

pgv = attempt_to_import('pygraphviz', 'pgv')
stim_list.insert(0, 'ExtractorResult')
Expand Down
3 changes: 2 additions & 1 deletion pliers/stimuli/audio.py
@@ -1,9 +1,10 @@
''' Classes that represent audio clips. '''

from .base import Stim
from moviepy.audio.io.AudioFileClip import AudioFileClip
from moviepy.video.io.ffmpeg_reader import ffmpeg_parse_infos

from .base import Stim


class AudioStim(Stim):

Expand Down
9 changes: 5 additions & 4 deletions pliers/stimuli/base.py
@@ -1,20 +1,21 @@
''' Base class for all Stims and associated functionality. '''


from abc import ABCMeta, abstractmethod
from os.path import isdir, join, basename, realpath, isfile
from glob import glob
from urllib.request import urlopen
from urllib.parse import urlparse
from collections import namedtuple
from contextlib import contextmanager
from pliers import config
from pliers.utils import isiterable
import pandas as pd
import os
import tempfile
import base64

import pandas as pd

from pliers import config
from pliers.utils import isiterable


class Stim(metaclass=ABCMeta):

Expand Down
10 changes: 6 additions & 4 deletions pliers/stimuli/image.py
@@ -1,13 +1,15 @@
''' Classes that represent images. '''

from .base import Stim
from imageio import imread, imsave
from PIL import Image
from functools import lru_cache
from urllib.request import urlopen
import io

from imageio import imread, imsave
from PIL import Image
import numpy as np
from functools import lru_cache

from .base import _get_bytestring
from .base import Stim


class ImageStim(Stim):
Expand Down

0 comments on commit 6d2ee55

Please sign in to comment.