pushikoo 0.2.1__tar.gz → 0.2.3__tar.gz

{pushikoo-0.2.1 → pushikoo-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pushikoo
-Version: 0.2.1
+Version: 0.2.3
 Summary: A message synchronization framework.
 Author: Pushikoo
 Project-URL: Homepage, https://github.com/Pushikoo/Pushikoo

{pushikoo-0.2.1 → pushikoo-0.2.3}/pyproject.toml

@@ -1,6 +1,10 @@
+[build-system]
+build-backend = "setuptools.build_meta"
+requires = ["setuptools", "wheel"]
+
 [project]
 name = "pushikoo"
-version = "0.2.1"
+version = "0.2.3"
 description = "A message synchronization framework."
 readme = "README.md"
 authors = [{ name = "Pushikoo" }]

{pushikoo-0.2.1 → pushikoo-0.2.3}/src/pushikoo/api/v1/instance.py

@@ -48,7 +48,7 @@ def create_instance(instance_create: AdapterInstanceCreate) -> AdapterInstance:
 def delete_instance(instance_id: UUID) -> Response:
     """Delete an adapter instance by ID."""
     try:
-        instance = AdapterInstanceService.get_object_by_id(instance_id)
+        instance = AdapterInstanceService.get(instance_id)
         AdapterInstanceService.delete(instance.adapter_name, instance.identifier)
         return Response(status_code=status.HTTP_204_NO_CONTENT)
     except (KeyError, ValueError):
@@ -61,7 +61,7 @@ def delete_instance(instance_id: UUID) -> Response:
 def get_instance_config(instance_id: UUID) -> dict:
     """Get configuration for an adapter instance by ID."""
     try:
-        instance = AdapterInstanceService.get_object_by_id(instance_id)
+        instance = AdapterInstanceService.get(instance_id)
         config = AdapterInstanceService.get_config(
             instance.adapter_name, instance.identifier
         )
@@ -76,7 +76,7 @@ def get_instance_config(instance_id: UUID) -> dict:
 def set_instance_config(instance_id: UUID, config: dict[str, Any]) -> dict:
     """Set configuration for an adapter instance by ID."""
     try:
-        instance = AdapterInstanceService.get_object_by_id(instance_id)
+        instance = AdapterInstanceService.get(instance_id)
         return AdapterInstanceService.set_config(
             instance.adapter_name, instance.identifier, config
         )

{pushikoo-0.2.1 → pushikoo-0.2.3}/src/pushikoo/service/adapter.py

@@ -210,6 +210,21 @@ class AdapterInstanceService:
             AdapterInstanceService.instance_objects[instance_id] = instance
             return instance
 
+    @staticmethod
+    def get(instance_id: UUID) -> AdapterInstance:
+        """Get an adapter instance by ID, returning the Pydantic model."""
+        with get_session() as session:
+            row = session.get(AdapterInstanceDB, instance_id)
+
+        if not row:
+            raise KeyError(f"Adapter instance {instance_id} not found")
+
+        return AdapterInstance(
+            id=row.id,
+            adapter_name=row.adapter_name,
+            identifier=row.identifier,
+        )
+
     @staticmethod
     def create(instance_create: AdapterInstanceCreate) -> AdapterInstance:
         with get_session() as session:

{pushikoo-0.2.1 → pushikoo-0.2.3}/src/pushikoo/service/refresh.py

@@ -660,8 +660,8 @@ class CronService:
             raise ValueError(f"Invalid cron expression: '{expr}'")
 
     @staticmethod
-    def _job_id(cron_id: UUID) -> str:
-        return str(cron_id)
+    def _job_id(flow_id: UUID, cron_expr: str) -> str:
+        return str(flow_id) + cron_expr
 
     @staticmethod
     def _load_all_from_db() -> List[Tuple[UUID, UUID, str, bool]]:
@@ -684,7 +684,10 @@ class CronService:
                 for cron_id, flow_id, cron_expr, enabled in db_crons
                 if enabled
             ]
-            db_ids = {cls._job_id(cron_id) for cron_id, _, _ in enabled_crons}
+            db_ids = {
+                cls._job_id(flow_id, cron_expr)
+                for cron_id, flow_id, cron_expr in enabled_crons
+            }
 
             job_ids = {job.id for job in cls._scheduler.get_jobs()}
 
@@ -692,7 +695,7 @@ class CronService:
             to_remove = job_ids - db_ids
 
             cron_map = {
-                cls._job_id(cron_id): (cron_id, flow_id, cron_expr)
+                cls._job_id(flow_id, cron_expr): (cron_id, flow_id, cron_expr)
                 for cron_id, flow_id, cron_expr in enabled_crons
             }
 

{pushikoo-0.2.1 → pushikoo-0.2.3}/src/pushikoo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pushikoo
-Version: 0.2.1
+Version: 0.2.3
 Summary: A message synchronization framework.
 Author: Pushikoo
 Project-URL: Homepage, https://github.com/Pushikoo/Pushikoo