ironflock 1.3.3__py3-none-any.whl → 1.3.5__py3-none-any.whl

ironflock/CrossbarConnection.py

@@ -28,13 +28,13 @@ def getSerialNumber(serial_number: str = None) -> str:
         s_num = serial_number
     return s_num
 
-DATAPODS_WS_URI = "wss://cbw.datapods.io/ws-ua-usr"
+STUDIO_DEV_WS_URI = "wss://cbw.ironflock.dev/ws-ua-usr"
 STUDIO_WS_URI_OLD = "wss://cbw.record-evolution.com/ws-ua-usr"
 STUDIO_WS_URI = "wss://cbw.ironflock.com/ws-ua-usr"
 LOCALHOST_WS_URI = "ws://localhost:8080/ws-ua-usr"
 
 socketURIMap = {
-    "https://studio.datapods.io": DATAPODS_WS_URI,
+    "https://studio.ironflock.dev": STUDIO_DEV_WS_URI,
     "https://studio.record-evolution.com": STUDIO_WS_URI_OLD,
     "https://studio.ironflock.com": STUDIO_WS_URI,
     "http://localhost:8086": LOCALHOST_WS_URI,
@@ -196,7 +196,9 @@ class CrossbarConnection:
     async def stop(self) -> None:
         """Stop the connection"""
         if self.component:
-            await self.component.stop()
+            # Check if component is properly initialized before stopping
+            if hasattr(self.component, '_done_f') and self.component._done_f is not None:
+                await self.component.stop()
         self._is_connected = False
         self.session = None
         

ironflock/__init__.py

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

ironflock/ironflock.py

@@ -39,6 +39,7 @@ class IronFlock:
         self._app_name = os.environ.get("APP_NAME")
         self._swarm_key = int(os.environ.get("SWARM_KEY"))
         self._app_key = int(os.environ.get("APP_KEY"))
+        self._env = os.environ.get("ENV")
         self._connection = CrossbarConnection()
         self.mainFunc = mainFunc
         self._main_task = None
@@ -223,14 +224,11 @@ 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}"
+        full_topic = f"{self._swarm_key}.{self._device_key}.{self._app_key}.{self._env}.{topic}"
 
         try:
             reg = await self._connection.register(full_topic, endpoint, options=register_options)
+            print(f"Function registered for IronFlock topic '{topic}'. (Full WAMP topic: '{full_topic}')")
             return reg
         except Exception as e:
             print(f"Register failed: {e}")
@@ -489,6 +487,9 @@ class IronFlock:
                 # If no main function, just wait indefinitely
                 while self.is_connected:
                     await asyncio.sleep(1)
+        except asyncio.CancelledError:
+            # Task was cancelled (likely from stop() being called)
+            pass
         except KeyboardInterrupt:
             print("Shutting down...")
         except Exception as e:

{ironflock-1.3.3.dist-info → ironflock-1.3.5.dist-info}/METADATA

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: ironflock
-Version: 1.3.3
+Version: 1.3.5
 Summary: IronFlock Python SDK for connecting to the IronFlock Platform
 License-Expression: MIT
 License-File: LICENSE
 Author: Marko Petzold, IronFlock GmbH
 Author-email: info@ironflock.com
-Requires-Python: >=3.9
+Requires-Python: >=3.11
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Provides-Extra: dev
@@ -17,7 +17,7 @@ Requires-Dist: pydantic (>=2.0.0)
 Requires-Dist: pydantic ; extra == "dev"
 Requires-Dist: pytest ; extra == "dev"
 Requires-Dist: ruff ; extra == "dev"
-Requires-Dist: sphinx (>=7) ; extra == "docs"
+Requires-Dist: sphinx (>=8.2.3) ; extra == "docs"
 Requires-Dist: sphinx-autodoc-typehints (>=2.0) ; extra == "docs"
 Requires-Dist: sphinx-book-theme (>=1.1.4) ; extra == "docs"
 Project-URL: Homepage, https://github.com/RecordEvolution/ironflock-py
@@ -38,8 +38,7 @@ For more information on the IronFlock IoT Devops Platform for engineers and deve
 
 ## Requirements
 
-- Python 3.8 or higher
-- Compatible with Python 3.8, 3.9, 3.10, 3.11, and 3.12
+- Python 3.11 or higher
 
 ## Installation
 
@@ -97,6 +96,7 @@ Install the necessary build tools if you don't have them already:
 pip install --upgrade build twine
 ```
 
+Make sure your pypi API tokens are stored in your `~/.pypirc`.
 Build and publish a new pypi package:
 
 ```shell

ironflock-1.3.5.dist-info/RECORD

@@ -0,0 +1,8 @@
+ironflock/CrossbarConnection.py,sha256=WcxFl7ai_59G3-_AdPAMU1mE0TWDaQ1qLARG0rIyMPk,14151
+ironflock/__init__.py,sha256=z08UA2gCpcdUHs06NFDyMU-M6snTEj4w2Tc3fIfMpmA,203
+ironflock/ironflock.py,sha256=sLP0Mfp3bgtyE0Qv7LTUDOY8YlRDM0PxJG8eZplluoU,19536
+ironflock/types.py,sha256=yync91abyrI1fqbmczW5My7Skx7-8soENGHK2JfaEz0,11962
+ironflock-1.3.5.dist-info/METADATA,sha256=a-rQlncmWiTlRYEIOepZj9aXQsVWO76AeFiAQxlfyeA,3472
+ironflock-1.3.5.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+ironflock-1.3.5.dist-info/licenses/LICENSE,sha256=GpUKjPB381nmkbBIdX74vxXhsNZaNpngTOciss39Pjk,1073
+ironflock-1.3.5.dist-info/RECORD,,

ironflock-1.3.3.dist-info/RECORD

@@ -1,8 +0,0 @@
-ironflock/CrossbarConnection.py,sha256=JLMmmnlv3I0Mohz6XdqyQ8-M_qPo3zs_hyIBthFvcTQ,13976
-ironflock/__init__.py,sha256=_07bufEcjL-TSWKyBCtXEVh2CxAQGsT3w9p10pgHMxU,203
-ironflock/ironflock.py,sha256=9BVEDCjFI0uoqA-yz_th9LynkVFbtMSnA4Bj4Tsc4JA,19395
-ironflock/types.py,sha256=yync91abyrI1fqbmczW5My7Skx7-8soENGHK2JfaEz0,11962
-ironflock-1.3.3.dist-info/METADATA,sha256=kxAJohNFrdmYSIIg-_-vpCwAsnRpCAYUf_GWds-BzTU,3459
-ironflock-1.3.3.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-ironflock-1.3.3.dist-info/licenses/LICENSE,sha256=GpUKjPB381nmkbBIdX74vxXhsNZaNpngTOciss39Pjk,1073
-ironflock-1.3.3.dist-info/RECORD,,