ironflock 1.3.1__tar.gz → 1.3.3__tar.gz

{ironflock-1.3.1 → ironflock-1.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ironflock
-Version: 1.3.1
+Version: 1.3.3
 Summary: IronFlock Python SDK for connecting to the IronFlock Platform
 License-Expression: MIT
 License-File: LICENSE

{ironflock-1.3.1 → ironflock-1.3.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ironflock"
-version = "1.3.1"
+version = "1.3.3"
 description = "IronFlock Python SDK for connecting to the IronFlock Platform"
 authors = [
     {name = "Marko Petzold, IronFlock GmbH", email = "info@ironflock.com"}

{ironflock-1.3.1 → ironflock-1.3.3}/src/ironflock/__init__.py

@@ -7,4 +7,4 @@ __all__ = [
     "Stage"
 ]
 
-__version__ = "1.3.1"
+__version__ = "1.3.3"

{ironflock-1.3.1 → ironflock-1.3.3}/src/ironflock/ironflock.py

@@ -222,9 +222,15 @@ class IronFlock:
 
         # Convert options dict to RegisterOptions if provided
         register_options = RegisterOptions(**options) if options else None
+        
+        swarm_key = os.environ.get("SWARM_KEY")
+        app_key = os.environ.get("APP_KEY")
+        env_value = os.environ.get("ENV")
+        
+        full_topic = f"{swarm_key}.{self._device_key}.{app_key}.{env_value}.{topic}"
 
         try:
-            reg = await self._connection.register(topic, endpoint, options=register_options)
+            reg = await self._connection.register(full_topic, endpoint, options=register_options)
             return reg
         except Exception as e:
             print(f"Register failed: {e}")
@@ -382,7 +388,7 @@ class IronFlock:
         sub = await self.subscribe(topic, handler, params.options)
         return sub
 
-    async def getHistory(self, tablename: str, queryParams: Union[TableQueryParams, dict]) -> Optional[Any]:
+    async def getHistory(self, tablename: str, queryParams: Union[TableQueryParams, dict] = {"limit": 10}) -> Optional[Any]:
         """Get historical data from a table using the history service
         
         Calls the "history.table" topic with the specified table name and query parameters.
@@ -422,31 +428,29 @@ class IronFlock:
             return None
             
         # Prepare the call arguments
-        call_args = {
-            'tablename': tablename,
-            'queryParams': validated_params.model_dump()  # Convert to dict for serialization
-        }
-        
-        # Add device metadata
-        device_metadata = {
-            "DEVICE_SERIAL_NUMBER": self._serial_number,
-            "DEVICE_KEY": self._device_key,
-            "DEVICE_NAME": self._device_name,
-        }
-        
-        # Merge device metadata with call arguments
-        combined_kwargs = {**device_metadata, **call_args}
+        queryParams = validated_params.model_dump()
         
+        topic = f"history.transformed.app.{self._app_key}.{tablename}"
         try:
             result = await self._connection.call(
-                'history.table',
-                args=[],
-                kwargs=combined_kwargs
+                topic,
+                args=[queryParams]
             )
             return result
         except Exception as e:
-            print(f"Get history failed: {e}")
-            return None
+            # Check for specific WAMP errors indicating procedure not available
+            error_str = str(e)
+            if (hasattr(e, 'error') and 
+                ('no_such_procedure' in str(e.error) or 'runtime_error' in str(e.error))) or \
+               'no callee registered for procedure' in error_str:
+                print(f"Get history failed: History service procedure '{topic}' not registered in Crossbar")
+                print(f"  Error type: {getattr(e, 'error', 'Unknown')}")
+                print(f"  Error details: {e}")
+                print(f"  This indicates the history service is not available or not properly configured")
+                return None
+            else:
+                print(f"Get history failed: {e}")
+                return None
 
     async def start(self):
         """Start the connection and run the main function if provided"""