ironflock 1.0.2__tar.gz → 1.0.4__tar.gz

{ironflock-1.0.2/ironflock.egg-info → ironflock-1.0.4}/PKG-INFO

@@ -1,41 +1,25 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: ironflock
-Version: 1.0.2
+Version: 1.0.4
 Summary: SDK to integrate your IronFlock Industry 4 Apps with the IronFlock Data Infrastructure
-Home-page: https://github.com/RecordEvolution/ironflock-python
+Home-page: https://github.com/RecordEvolution/ironflock-py
 Author: Record Evolution GmbH
-Author-email: Marko Petzold <marko.petzold@record-evolution.de>
-License: MIT License
-        
-        Copyright (c) 2021 Record Evolution
-        
-        Permission is hereby granted, free of charge, to any person obtaining a copy
-        of this software and associated documentation files (the "Software"), to deal
-        in the Software without restriction, including without limitation the rights
-        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-        copies of the Software, and to permit persons to whom the Software is
-        furnished to do so, subject to the following conditions:
-        
-        The above copyright notice and this permission notice shall be included in all
-        copies or substantial portions of the Software.
-        
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-        SOFTWARE.
-        
-Project-URL: Homepage, https://github.com/RecordEvolution/ironflock-py
-Project-URL: Issues, https://github.com/RecordEvolution/ironflock-py/issues
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Requires-Python: >=3.6
+Author-email: marko.petzold@record-evolution.de
+License: MIT
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: autobahn[asyncio,serialization]==22.3.2
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # ironflock
 
@@ -86,7 +70,7 @@ The `IronFlock` `__init__` function can be configured with the following options
 ## Advanced Usage
 
 If you need more control, e.g. acting on lifecycle events (`onJoin`, `onLeave`) take a look at
-the [examples](./examples/) folder.
+the [examples](https://github.com/RecordEvolution/ironflock-py/tree/main/examples) folder.
 
 
 ## Development

{ironflock-1.0.2 → ironflock-1.0.4}/README.md

@@ -47,7 +47,7 @@ The `IronFlock` `__init__` function can be configured with the following options
 ## Advanced Usage
 
 If you need more control, e.g. acting on lifecycle events (`onJoin`, `onLeave`) take a look at
-the [examples](./examples/) folder.
+the [examples](https://github.com/RecordEvolution/ironflock-py/tree/main/examples) folder.
 
 
 ## Development

{ironflock-1.0.2 → ironflock-1.0.4}/ironflock/__init__.py

@@ -7,4 +7,4 @@ from ironflock.ironflock import IronFlock
 
 __all__ = ["IronFlock", "create_application_component", "create_application_session"]
 
-__version__ = "0.0.19"
+__version__ = "1.0.4"

{ironflock-1.0.2 → ironflock-1.0.4}/ironflock/ironflock.py

@@ -1,8 +1,9 @@
 import os
+import asyncio
 from typing import Optional
 from autobahn.asyncio.component import Component, run
 from autobahn.wamp.interfaces import ISession
-from autobahn.wamp.types import PublishOptions
+from autobahn.wamp.types import PublishOptions, RegisterOptions
 from autobahn.wamp.request import Publication
 
 from ironflock.AutobahnConnection import getSerialNumber, create_application_component
@@ -13,8 +14,6 @@ class IronFlock:
 
     Example:
 
-        ironFlock = IronFlock()
-
         async def main():
             while True:
                 publication = await ironFlock.publish("test.publish.pw", 1, "two", 3, foo="bar")
@@ -23,7 +22,7 @@ class IronFlock:
 
 
         if __name__ == "__main__":
-            asyncio.get_event_loop().create_task(main())
+            ironflock = IronFlock(mainFunc=main)
             ironFlock.run()
     """
 
@@ -45,17 +44,22 @@ class IronFlock:
         async def onJoin(session, details):
             print("component joined")
             self._session = session
+            self._main_task = asyncio.create_task(mainFunc())
+
             if self.mainFunc: 
                 await self.mainFunc()
 
         @self._component.on_disconnect
-        def onDisconnect(*args, **kwargs):
-            print("component disconnected")
-            self._session = None
-
         @self._component.on_leave
-        def onLeave(*args, **kwargs):
+        async def onLeave(*args, **kwargs):
             print("component left")
+            if self._main_task:
+                self._main_task.cancel()
+                try:
+                    await self._main_task
+                except asyncio.CancelledError:
+                    pass
+                self._main_task = None
             self._session = None
 
     @property
@@ -122,6 +126,24 @@ class IronFlock:
         if hasattr(self, "_session") and hasattr(self._session, "call"):
             res = await self._session.call('ironflock.location_service.update', payload, **extra)
         return res
+    
+    async def register_function(self, topic: str, func: function):
+        """Registers a function to be called when a message is received on the given topic.
+        
+        Args:
+            topic (str): The URI of the topic to register the function for, e.g. "example.mytopic1".
+            func (callable): The function to call when a message is received on the topic.
+        """
+        swarm_key = os.environ.get("SWARM_KEY")
+        app_key = os.environ.get("APP_KEY")
+        env_value = os.environ.get("ENV")
+        
+        topic = f"{swarm_key}.{self._device_key}.{app_key}.{env_value}.{topic}"
+        
+        if self._session is not None:
+            await self._session.register(topic, func, options=RegisterOptions(force_reregister=True))
+        else:
+            print("cannot register function, not connected")
 
     async def publish_to_table(
         self, tablename: str, *args, **kwargs

{ironflock-1.0.2 → ironflock-1.0.4/ironflock.egg-info}/PKG-INFO

@@ -1,41 +1,25 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: ironflock
-Version: 1.0.2
+Version: 1.0.4
 Summary: SDK to integrate your IronFlock Industry 4 Apps with the IronFlock Data Infrastructure
-Home-page: https://github.com/RecordEvolution/ironflock-python
+Home-page: https://github.com/RecordEvolution/ironflock-py
 Author: Record Evolution GmbH
-Author-email: Marko Petzold <marko.petzold@record-evolution.de>
-License: MIT License
-        
-        Copyright (c) 2021 Record Evolution
-        
-        Permission is hereby granted, free of charge, to any person obtaining a copy
-        of this software and associated documentation files (the "Software"), to deal
-        in the Software without restriction, including without limitation the rights
-        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-        copies of the Software, and to permit persons to whom the Software is
-        furnished to do so, subject to the following conditions:
-        
-        The above copyright notice and this permission notice shall be included in all
-        copies or substantial portions of the Software.
-        
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-        SOFTWARE.
-        
-Project-URL: Homepage, https://github.com/RecordEvolution/ironflock-py
-Project-URL: Issues, https://github.com/RecordEvolution/ironflock-py/issues
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Requires-Python: >=3.6
+Author-email: marko.petzold@record-evolution.de
+License: MIT
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: autobahn[asyncio,serialization]==22.3.2
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # ironflock
 
@@ -86,7 +70,7 @@ The `IronFlock` `__init__` function can be configured with the following options
 ## Advanced Usage
 
 If you need more control, e.g. acting on lifecycle events (`onJoin`, `onLeave`) take a look at
-the [examples](./examples/) folder.
+the [examples](https://github.com/RecordEvolution/ironflock-py/tree/main/examples) folder.
 
 
 ## Development

ironflock-1.0.4/pyproject.toml

@@ -0,0 +1,6 @@
+[build-system]
+requires = [
+    "setuptools>=42",
+    "wheel"
+]
+build-backend = "setuptools.build_meta"

{ironflock-1.0.2 → ironflock-1.0.4}/setup.py

@@ -10,16 +10,16 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="ironflock",
-    version="1.0.1",
-    description="Publishing data to a IronFlock Fleet Storage",
+    version="1.0.4",
+    description="SDK to integrate your IronFlock Industry 4 Apps with the IronFlock Data Infrastructure",
     long_description=long_description,
     long_description_content_type="text/markdown",
-    url="https://github.com/RecordEvolution/ironflock-python",
+    url="https://github.com/RecordEvolution/ironflock-py",
     author="Record Evolution GmbH",
     author_email="marko.petzold@record-evolution.de",
     packages=find_packages(),
     license="MIT",
-    python_requires=">=3.6",
+    python_requires=">=3.8",
     install_requires=requirements,
     classifiers=[],
 )

ironflock-1.0.2/pyproject.toml

@@ -1,30 +0,0 @@
-[project]
-name = "ironflock"
-version = "1.0.2"
-authors = [
-  { name = "Marko Petzold", email = "marko.petzold@record-evolution.de" },
-]
-description = "SDK to integrate your IronFlock Industry 4 Apps with the IronFlock Data Infrastructure"
-readme = "README.md"
-requires-python = ">=3.8"
-license = { file = "LICENSE" }  # Reference to the LICENSE file
-classifiers = [
-    "Programming Language :: Python :: 3",
-    "License :: OSI Approved :: MIT License",
-    "Operating System :: OS Independent",
-]
-
-dependencies = [
-    "autobahn[asyncio,serialization]==22.3.2"
-]
-
-[project.urls]
-Homepage = "https://github.com/RecordEvolution/ironflock-py"
-Issues = "https://github.com/RecordEvolution/ironflock-py/issues"
-
-[build-system]
-requires = [
-    "setuptools>=42",
-    "wheel"
-]
-build-backend = "setuptools.build_meta"