celery-fastapi 0.1.1__tar.gz → 0.1.3__tar.gz

{celery_fastapi-0.1.1 → celery_fastapi-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: celery-fastapi
-Version: 0.1.1
+Version: 0.1.3
 Summary: Automatic REST API generation for Celery tasks with FastAPI
 License: MIT
 License-File: LICENSE

{celery_fastapi-0.1.1 → celery_fastapi-0.1.3}/celery_fastapi/cli.py

@@ -72,6 +72,30 @@ app = typer.Typer(
 console = Console()
 
 
+def _create_app_from_env() -> Any:
+    """
+    Factory function to create FastAPI app from environment variables.
+
+    This is used when running with multiple workers or reload enabled,
+    as uvicorn requires an import string in these cases.
+    """
+    from celery_fastapi.app import create_app
+
+    celery_app = os.environ.get("CELERY_FASTAPI_CELERY_APP")
+    prefix = os.environ.get("CELERY_FASTAPI_PREFIX", "")
+    root_path = os.environ.get("CELERY_FASTAPI_ROOT_PATH", "")
+
+    if not celery_app:
+        raise ValueError("CELERY_FASTAPI_CELERY_APP environment variable not set")
+
+    return create_app(
+        celery_app,
+        title="Celery FastAPI",
+        prefix=prefix,
+        fastapi_kwargs={"root_path": root_path} if root_path else None,
+    )
+
+
 def version_callback(value: bool) -> None:
     """Print version and exit."""
     if value:
@@ -374,7 +398,19 @@ def serve(
     console.print("[dim]Press CTRL+C to stop[/]\n")
 
     # Run the server
-    uvicorn.run(fastapi_app, **uvicorn_config)
+    # When using workers > 1 or reload, we need to use an import string
+    if workers > 1 or reload:
+        # Set environment variables for the factory to use
+        os.environ["CELERY_FASTAPI_CELERY_APP"] = celery_app
+        os.environ["CELERY_FASTAPI_PREFIX"] = prefix
+        if root_path:
+            os.environ["CELERY_FASTAPI_ROOT_PATH"] = root_path
+
+        # Use the factory function as an import string
+        uvicorn.run("celery_fastapi.cli:_create_app_from_env", **uvicorn_config)
+    else:
+        # Single worker, can use app instance directly
+        uvicorn.run(fastapi_app, **uvicorn_config)
 
 
 @app.command()

{celery_fastapi-0.1.1 → celery_fastapi-0.1.3}/celery_fastapi/core.py

@@ -1,8 +1,9 @@
 """Core functionality for Celery FastAPI."""
 
 import inspect
+from collections.abc import Callable
 from datetime import datetime
-from typing import Any, Callable, get_type_hints
+from typing import Any, get_type_hints
 
 from celery import Celery
 from celery.result import AsyncResult
@@ -222,7 +223,7 @@ def _create_task_payload_model(
     model_name = f"{task_name.replace('.', '_').title().replace('_', '')}Payload"
 
     # Create and return the dynamic model
-    model: type[BaseModel] = create_model(model_name, **field_definitions)  # type: ignore[call-overload]
+    model: type[BaseModel] = create_model(model_name, **field_definitions)
     model.__doc__ = f"Payload for {task_name} task. Default queue: {default_queue}"
 
     # Set model config for examples
@@ -324,7 +325,7 @@ class CeleryFastAPIBridge:
 
         # Store the registered task names from THIS app only
         self._app_task_names: set[str] = set()
-        for name in self.celery_app.tasks.keys():
+        for name in self.celery_app.tasks:
             if self.task_filter(name):
                 self._app_task_names.add(name)
 
@@ -403,7 +404,9 @@ class CeleryFastAPIBridge:
             celery_option_names = set(CELERY_OPTIONS_FIELDS.keys())
             task_kwargs: dict[str, Any] = {}
 
-            for field_name in payload.model_fields:
+            # Access model_fields from the class, not the instance (Pydantic V2.11+)
+            payload_fields = type(payload).model_fields  # type: ignore[attr-defined]
+            for field_name in payload_fields:
                 if field_name not in celery_option_names:
                     value = getattr(payload, field_name, None)
                     if value is not None:
@@ -751,8 +754,8 @@ class CeleryFastAPIBridge:
         routes: list[dict[str, str]] = []
         for route in self.fastapi_app.routes:
             if hasattr(route, "path") and hasattr(route, "methods"):
-                path = getattr(route, "path")
-                methods = getattr(route, "methods")
+                path = route.path
+                methods = route.methods
                 for method in methods:
                     if method != "HEAD":
                         routes.append({"path": path, "method": method})

{celery_fastapi-0.1.1 → celery_fastapi-0.1.3}/celery_fastapi/server.py

@@ -10,7 +10,7 @@ if TYPE_CHECKING:
 
 def create_gunicorn_app(
     app: Any, options: dict[str, Any] | None = None
-) -> "BaseApplication":
+) -> BaseApplication:
     """Create a Gunicorn application instance.
 
     Args:
@@ -31,7 +31,7 @@ def create_gunicorn_app(
             "Install with: pip install celery-fastapi[gunicorn]"
         ) from exc
 
-    class _GunicornApp(BaseApplication):  # type: ignore[misc]
+    class _GunicornApp(BaseApplication):
         """Internal Gunicorn application wrapper."""
 
         def __init__(

{celery_fastapi-0.1.1 → celery_fastapi-0.1.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "celery-fastapi"
-version = "0.1.1"
+version = "0.1.3"
 description = "Automatic REST API generation for Celery tasks with FastAPI"
 authors = ["ilkerkara <ilkerkara@outlook.com.tr>"]
 license = "MIT"