refactor: move services modules to a more appropriate subpackage

DotzInc · May 10, 2024 · 189d686 · 189d686
1 parent a5d484e
commit 189d686
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 6 deletions.
diff --git a/fastapi_utils/services/__init__.py b/fastapi_utils/services/__init__.py
diff --git a/fastapi_utils/dependencies/cloud_storage.py → fastapi_utils/services/cloud_storage.py b/fastapi_utils/dependencies/cloud_storage.py → fastapi_utils/services/cloud_storage.py
diff --git a/fastapi_utils/protocols.py → fastapi_utils/services/protocols.py b/fastapi_utils/protocols.py → fastapi_utils/services/protocols.py
diff --git a/fastapi_utils/dependencies/pubsub.py → fastapi_utils/services/pubsub.py b/fastapi_utils/dependencies/pubsub.py → fastapi_utils/services/pubsub.py
diff --git a/tests/services/__init__.py b/tests/services/__init__.py
diff --git a/tests/dependencies/test_cloud_storage.py → tests/services/test_cloud_storage.py b/tests/dependencies/test_cloud_storage.py → tests/services/test_cloud_storage.py
@@ -2,8 +2,7 @@
 
 import pytest
 
-from fastapi_utils.dependencies import cloud_storage
-from fastapi_utils.protocols import Uploader
+from fastapi_utils.services import cloud_storage, protocols
 
 
 @pytest.fixture
@@ -17,7 +16,7 @@ def storage_mock(monkeypatch: pytest.MonkeyPatch) -> MagicMock:
 def test_uploader(storage_mock: MagicMock):
     uploader = cloud_storage.Uploader()
 
-    assert isinstance(uploader, Uploader)
+    assert isinstance(uploader, protocols.Uploader)
 
     uploader.upload("test-bucket", "destination.txt", "source.txt")
 

diff --git a/tests/dependencies/test_pubsub.py → tests/services/test_pubsub.py b/tests/dependencies/test_pubsub.py → tests/services/test_pubsub.py
@@ -5,8 +5,7 @@
 from fastapi.encoders import jsonable_encoder
 from pydantic import BaseModel
 
-from fastapi_utils.dependencies import pubsub
-from fastapi_utils.protocols import Publisher
+from fastapi_utils.services import protocols, pubsub
 
 MAGIC_NUMBER = "42"
 
@@ -29,7 +28,7 @@ def pubsub_mock(monkeypatch: pytest.MonkeyPatch) -> MagicMock:
 def test_publisher(pubsub_mock: MagicMock):
     publisher = pubsub.Publisher()
 
-    assert isinstance(publisher, Publisher)
+    assert isinstance(publisher, protocols.Publisher)
 
     topic = "projects/test-project/topics/test-topic"
     message = MessageTest(content="test")