chore: reorganize imports

joaodaher · joaodaher · commit 8def9655226d · 2025-09-28T11:18:41.000-03:00
diff --git a/examples/__init__.py b/examples/__init__.py
@@ -0,0 +1 @@
+"""Example application package for fastapi-cloudflow demos."""
diff --git a/examples/app/__init__.py b/examples/app/__init__.py
@@ -1,4 +1,12 @@
-from .flows.resilient_payment import GATEWAY_PAYMENT_FLOW, RESILIENT_PAYMENT_FLOW  # noqa: F401
-from .flows.retry_contract import RETRY_DEMO_WORKFLOW  # noqa: F401
-from .flows.subworkflow_contract import SUBWORKFLOW_DEMO  # noqa: F401
-from .flows.try_catch_contract import TRY_CATCH_DEMO  # noqa: F401
+from .flows.resilient_payment import GATEWAY_PAYMENT_FLOW, RESILIENT_PAYMENT_FLOW
+from .flows.retry_contract import RETRY_DEMO_WORKFLOW
+from .flows.subworkflow_contract import SUBWORKFLOW_DEMO
+from .flows.try_catch_contract import TRY_CATCH_DEMO
+
+__all__ = [
+    "GATEWAY_PAYMENT_FLOW",
+    "RESILIENT_PAYMENT_FLOW",
+    "RETRY_DEMO_WORKFLOW",
+    "SUBWORKFLOW_DEMO",
+    "TRY_CATCH_DEMO",
+]
diff --git a/examples/app/flows/__init__.py b/examples/app/flows/__init__.py
@@ -0,0 +1,17 @@
+"""Example flow definitions for FastAPI Cloudflow demos."""
+
+__all__ = [
+    "data_pipeline",
+    "echo_name",
+    "jokes",
+    "order",
+    "order_with_subworkflow",
+    "payments",
+    "post_story",
+    "pubsub_example",
+    "resilient_payment",
+    "retry_contract",
+    "subworkflow_contract",
+    "try_catch_contract",
+    "user",
+]
diff --git a/examples/app/main.py b/examples/app/main.py
@@ -1,14 +1,23 @@
 from fastapi import FastAPI
-from flows import data_pipeline, echo_name, jokes, order, payments, post_story, resilient_payment, user  # noqa: F401
 
+from examples.app.flows import (  # noqa: F401
+    data_pipeline,
+    echo_name,
+    jokes,
+    order,
+    payments,
+    post_story,
+    resilient_payment,
+    user,
+)
 from fastapi_cloudflow import attach_to_fastapi
 
 
 def create_app() -> FastAPI:
     app = FastAPI()
     # Import types used for stub endpoints
-    from flows.payments import PSPReq, PSPRes
-    from flows.user import IdentityReq, IdentityRes
+    from examples.app.flows.payments import PSPReq, PSPRes
+    from examples.app.flows.user import IdentityReq, IdentityRes
 
     @app.get("/health")
     def health() -> dict[str, str]:  # noqa: D401
diff --git a/pyproject.toml b/pyproject.toml
@@ -68,7 +68,7 @@ known-first-party = ["fastapi_cloudflow", "app", "tests"]
 
 
 [tool.ty.environment]
-root = ["./src", "./examples/app"]
+root = [".", "./src"]
 
 [tool.pytest.ini_options]
 addopts = [
diff --git a/src/fastapi_cloudflow/core/connectors.py b/src/fastapi_cloudflow/core/connectors.py
@@ -44,7 +44,7 @@ def pubsub_message(
         if isinstance(attributes, ArgExpr):
             message["attributes"] = attributes
         else:
-            message["attributes"] = attributes.copy()
+            message["attributes"] = dict(attributes)
 
     if ordering_key is not None:
         message["orderingKey"] = ordering_key
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -1 +1,5 @@
-"""Test package for fastapi-cloudflow."""
+"""Test suite package for fastapi-cloudflow."""
+
+from . import codegen
+
+__all__ = ["codegen"]
diff --git a/tests/codegen/__init__.py b/tests/codegen/__init__.py
@@ -0,0 +1,5 @@
+"""Code generation tests package."""
+
+from . import fixtures  # noqa: F401
+
+__all__ = ["fixtures"]
diff --git a/tests/codegen/fixtures/mermaid/retry-demo.mmd b/tests/codegen/fixtures/mermaid/retry-demo.mmd
@@ -0,0 +1,8 @@
+graph TD
+  subgraph retry-demo
+    retry-entry[retry-entry]
+    retry-gateway[retry-gateway]
+    retry-finalize[retry-finalize]
+    retry-entry --> retry-gateway
+    retry-gateway --> retry-finalize
+  end
diff --git a/tests/codegen/fixtures/mermaid/subworkflow-demo.mmd b/tests/codegen/fixtures/mermaid/subworkflow-demo.mmd
@@ -0,0 +1,8 @@
+graph TD
+  subgraph subworkflow-demo
+    subwf-prepare[subwf-prepare]
+    call_subwf_child[call_subwf_child]
+    subwf-finalize[subwf-finalize]
+    subwf-prepare --> call_subwf_child
+    call_subwf_child --> subwf-finalize
+  end
diff --git a/tests/codegen/fixtures/mermaid/try-catch-demo.mmd b/tests/codegen/fixtures/mermaid/try-catch-demo.mmd
@@ -0,0 +1,4 @@
+graph TD
+  subgraph try-catch-demo
+    tc-safe[tc-safe]
+  end
diff --git a/tests/codegen/test_retry_codegen.py b/tests/codegen/test_retry_codegen.py
@@ -5,7 +5,8 @@
 from pathlib import Path
 
 from examples.app.flows.retry_contract import RETRY_DEMO_WORKFLOW
-from tests.codegen.utils import assert_workflow_contract
+
+from .utils import assert_workflow_contract
 
 
 def test_retry_workflow_contract(tmp_path: Path) -> None:
diff --git a/tests/codegen/test_subworkflow_codegen.py b/tests/codegen/test_subworkflow_codegen.py
@@ -5,7 +5,8 @@
 from pathlib import Path
 
 from examples.app.flows.subworkflow_contract import SUBWORKFLOW_DEMO
-from tests.codegen.utils import assert_workflow_contract
+
+from .utils import assert_workflow_contract
 
 
 def test_subworkflow_contract(tmp_path: Path) -> None:
diff --git a/tests/codegen/test_try_catch_codegen.py b/tests/codegen/test_try_catch_codegen.py
@@ -5,7 +5,8 @@
 from pathlib import Path
 
 from examples.app.flows.try_catch_contract import TRY_CATCH_DEMO
-from tests.codegen.utils import assert_workflow_contract
+
+from .utils import assert_workflow_contract
 
 
 def test_try_catch_contract(tmp_path: Path) -> None:
diff --git a/tests/unit/test_echo_name_steps.py b/tests/unit/test_echo_name_steps.py
@@ -1,7 +1,8 @@
 from __future__ import annotations
 
 from fastapi.testclient import TestClient
-from main import app
+
+from examples.app.main import app
 
 
 def test_extract_name_and_name_shout() -> None:
diff --git a/tests/unit/test_health.py b/tests/unit/test_health.py
@@ -1,7 +1,8 @@
 from __future__ import annotations
 
 from fastapi.testclient import TestClient
-from main import app
+
+from examples.app.main import app
 
 
 def test_health() -> None:
diff --git a/tests/unit/test_joke_flow_steps.py b/tests/unit/test_joke_flow_steps.py
@@ -1,7 +1,8 @@
 from __future__ import annotations
 
 from fastapi.testclient import TestClient
-from main import app
+
+from examples.app.main import app
 
 
 def test_joke_split_and_rate() -> None:
diff --git a/tests/unit/test_order_flow.py b/tests/unit/test_order_flow.py
@@ -1,7 +1,8 @@
 from __future__ import annotations
 
 from fastapi.testclient import TestClient
-from main import app
+
+from examples.app.main import app
 
 
 def test_price_order() -> None:
diff --git a/tests/unit/test_post_story_steps.py b/tests/unit/test_post_story_steps.py
@@ -1,7 +1,8 @@
 from __future__ import annotations
 
 from fastapi.testclient import TestClient
-from main import app
+
+from examples.app.main import app
 
 
 def test_build_story_and_summarize() -> None:
diff --git a/tests/unit/test_runtime_errors.py b/tests/unit/test_runtime_errors.py
@@ -1,7 +1,8 @@
 from __future__ import annotations
 
 from fastapi.testclient import TestClient
-from main import app
+
+from examples.app.main import app
 
 
 def test_malformed_json_returns_422() -> None:
diff --git a/tests/unit/test_user_and_payments.py b/tests/unit/test_user_and_payments.py
@@ -1,7 +1,8 @@
 from __future__ import annotations
 
 from fastapi.testclient import TestClient
-from main import app
+
+from examples.app.main import app
 
 
 def test_hash_password() -> None:

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+"""Example application package for fastapi-cloudflow demos."""`