Skip to content

Commit aef1ffb

Browse files
committed
refactor: clean up operation imports
Signed-off-by: Joshua Locash <locashjosh@gmail.com>
1 parent e476d20 commit aef1ffb

9 files changed

Lines changed: 52 additions & 25 deletions

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Each class instance is mapped to a resource in the graph:
7777

7878
```python
7979
from tamper.core import ImageAsset, load_asset_from_file
80-
from tamper.ops.image import Compress
80+
from tamper.ops import Compress
8181
from rdflib import Graph, BNode
8282

8383
# All of our data lives in a graph

tamper/ops/__init__.py

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
from .add_noise import AddGaussianNoise, AddSaltPepperNoise
2+
from .compress import Compress
3+
from .crop import Crop
4+
from .image import (
5+
Resize,
6+
MedianFilter,
7+
GaussianBlur,
8+
)
9+
from .resample import Resample
10+
from .transcode import Transcode
11+
from .validation import validate_operations
12+
13+
14+
__all__ = [
15+
"AddGaussianNoise",
16+
"AddSaltPepperNoise",
17+
"Compress",
18+
"Crop",
19+
"Resize",
20+
"MedianFilter",
21+
"GaussianBlur",
22+
"AddGaussianNoise",
23+
"AddSaltPepperNoise",
24+
"Resample",
25+
"Transcode",
26+
"validate_operations",
27+
]

tamper/plans/thread_executor.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,21 @@
66
from rdflib import Graph, Node, URIRef
77

88
from tamper.core.operation import OperationURI
9-
from tamper.ops.validation import validate_operations
10-
from tamper.vocabularies._TAMPER import TAMPER
11-
from tamper.ops.transcode import Transcode
12-
from tamper.ops.resample import Resample
13-
from tamper.ops.compress import Compress
14-
from tamper.ops.crop import Crop
15-
from tamper.ops.add_noise import AddGaussianNoise, AddSaltPepperNoise
16-
from tamper.ops.image import (
9+
from tamper.ops import (
10+
Transcode,
11+
Resample,
12+
Compress,
13+
Crop,
14+
AddSaltPepperNoise,
15+
AddGaussianNoise,
1716
Resize,
1817
MedianFilter,
1918
GaussianBlur,
19+
validate_operations,
2020
)
2121

22+
from tamper.vocabularies._TAMPER import TAMPER
23+
2224
from .operation_plan import OperationPlanExecutor
2325
from tamper.core import Operation, OperationPlan, PlanStep, MediaAsset
2426

tests/test_ops_add_noise.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@
44

55
from tamper.core import ImageAsset, load_asset_from_file
66
from tamper.core.operation import OperationURI
7-
from tamper.ops.add_noise import (
8-
AddGaussianNoise,
9-
AddSaltPepperNoise,
10-
)
7+
from tamper.ops import AddGaussianNoise, AddSaltPepperNoise
118

129
IMAGES = Path(__file__).parent / "test-media" / "images"
1310
JPG = IMAGES / "file_example_JPG_100kB.jpg"

tests/test_ops_crop.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
from tamper.core import ImageAsset, VideoAsset, load_asset_from_file
1515
from tamper.core.operation import OperationURI
16-
from tamper.ops.crop import Crop
16+
from tamper.ops import Crop
1717

1818
TEST_MEDIA = Path(__file__).parent / "test-media"
1919
JPG = TEST_MEDIA / "images" / "file_example_JPG_100kB.jpg"

tests/test_ops_image.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
from tamper.core import ImageAsset, load_asset_from_file
77
from tamper.core.operation import OperationURI
8-
from tamper.ops.compress import Compress
9-
from tamper.ops.image import (
8+
from tamper.ops import (
9+
Compress,
1010
GaussianBlur,
1111
MedianFilter,
1212
Resize,

tests/test_ops_resample.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
from tamper.core import MediaAsset, load_asset_from_file
1010
from tamper.core.operation import OperationURI
11-
from tamper.ops.resample import Resample
11+
from tamper.ops import Resample
1212

1313
TEST_MEDIA = Path(__file__).parent / "test-media"
1414
WAV = TEST_MEDIA / "audio" / "file_example_WAV_1MG.wav"

tests/test_ops_transcode.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from tamper.core import load_asset_from_file
1515
from tamper.core.assets import StreamContainer
1616
from tamper.core.operation import OperationURI
17-
from tamper.ops.transcode import Transcode
17+
from tamper.ops import Transcode
1818

1919
TEST_MEDIA = Path(__file__).parent / "test-media"
2020
MP4 = TEST_MEDIA / "video" / "file_example_MP4_480_1_5MG.mp4"

tests/test_ops_validation.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,18 @@
1212

1313
from tamper.core.operation import OperationURI
1414
from tamper.errors import GraphValidationError
15-
from tamper.ops.resample import Resample
16-
from tamper.ops.compress import Compress
17-
from tamper.ops.crop import Crop
18-
from tamper.ops.add_noise import AddGaussianNoise, AddSaltPepperNoise
19-
from tamper.ops.image import (
15+
from tamper.ops import (
16+
Resample,
17+
Compress,
18+
Crop,
19+
AddGaussianNoise,
20+
AddSaltPepperNoise,
2021
GaussianBlur,
2122
MedianFilter,
2223
Resize,
24+
Transcode,
25+
validate_operations,
2326
)
24-
from tamper.ops.transcode import Transcode
25-
from tamper.ops.validation import validate_operations
2627
from tamper.vocabularies import TAMPER
2728

2829

0 commit comments

Comments
 (0)