smartx-rfid 1.5.4__py3-none-any.whl → 1.8.0__py3-none-any.whl

smartx_rfid/__init__.py

@@ -3,7 +3,7 @@
 from importlib.metadata import version
 
 try:
-    __version__ = version("publish-lib-example")
+    __version__ = version("smartx_rfid")
 except Exception:
     # Fallback for development environments
     __version__ = "0.0.0-dev"

smartx_rfid/devices/RFID/R700_IOT/_main.py

@@ -145,10 +145,6 @@ class R700_IOT(OnEvent, ReaderHelpers, WriteCommands):
                 self.on_event(self.name, "connection", True)
                 await self.get_tag_list(session)
 
-    async def clear_tags(self):
-        """Clear all stored tags from memory."""
-        self.tags = {}
-
     async def write_gpo(
         self,
         pin: int = 1,

smartx_rfid/devices/RFID/X714/rfid.py

@@ -4,11 +4,11 @@ import asyncio
 class RfidCommands:
     """RFID reader control commands for X714."""
 
-    def start_inventory(self):
+    async def start_inventory(self):
         """Start reading RFID tags."""
         self.write("#READ:ON")
 
-    def stop_inventory(self):
+    async def stop_inventory(self):
         """Stop reading RFID tags."""
         self.write("#READ:OFF")
 
@@ -70,9 +70,9 @@ class RfidCommands:
 
         # Start Reading
         if self.start_reading:
-            self.start_inventory()
+            asyncio.create_task(self.start_inventory())
         else:
-            self.stop_inventory()
+            asyncio.create_task(self.stop_inventory())
 
     async def auto_clear(self):
         while True:

smartx_rfid/utils/__init__.py

@@ -1,3 +1,3 @@
+from .regex import regex_hex
 from .tag_list import TagList
 from .logger_manager import LoggerManager
-from .regex import regex_hex

smartx_rfid/utils/tag_list.py

@@ -3,6 +3,7 @@ from datetime import datetime
 from threading import Lock
 import logging
 from pyepc import SGTIN
+from smartx_rfid.schemas.tag import TagSchema
 
 
 class TagList:
@@ -13,7 +14,7 @@ class TagList:
     Each tag is uniquely identified by either EPC or TID.
     """
 
-    def __init__(self, unique_identifier: Literal["epc", "tid"] = "epc"):
+    def __init__(self, unique_identifier: Literal["epc", "tid"] = "epc", prefix: str | list | None = None):
         """
         Initialize the tag list.
 
@@ -27,6 +28,10 @@ class TagList:
         self._tags: Dict[str, Dict[str, Any]] = {}
         self._lock = Lock()
 
+        if isinstance(prefix, str):
+            prefix = [prefix]
+        self.prefix: list | None = prefix
+
     def __len__(self) -> int:
         """
         Return the number of stored tags.
@@ -55,20 +60,30 @@ class TagList:
             (False, None)      if an error occurs;
         """
         try:
+            # Validate Tag
+            TagSchema.model_validate(tag)
+
             identifier_value = tag.get(self.unique_identifier)
             if not identifier_value:
                 raise ValueError(f"Tag missing '{self.unique_identifier}'")
 
+            # Check Prefix
+            if self.prefix is not None:
+                epc = tag.get("epc")
+                if epc is None or not any(epc.startswith(p) for p in self.prefix):
+                    return False, None
+
+            # handle tag
             with self._lock:
                 if identifier_value not in self._tags:
                     stored = self._new_tag(tag, device)
                     return True, stored
                 else:
-                    stored = self._existing_tag(tag)
+                    stored = self._existing_tag(tag, device)
                     return False, stored
 
         except Exception as e:
-            logging.warning(f"[ TAG ERROR ] {e}")
+            logging.error(f"[ TAG ERROR ] {e}")
             return False, None
 
     def _new_tag(self, tag: Dict[str, Any], device: str) -> Dict[str, Any]:
@@ -90,18 +105,18 @@ class TagList:
             gtin = None
 
         stored_tag = {
-            **tag,
-            "device": device,
             "timestamp": now,
-            "count": 1,
+            "device": device,
+            **tag,
             "gtin": gtin,
+            "count": 1,
         }
 
         self._tags[tag[self.unique_identifier]] = stored_tag
 
         return stored_tag
 
-    def _existing_tag(self, tag: Dict[str, Any]) -> Dict[str, Any]:
+    def _existing_tag(self, tag: Dict[str, Any], device: str) -> Dict[str, Any]:
         """
         Update an existing tag.
 
@@ -122,6 +137,7 @@ class TagList:
             if old_rssi is None or abs(new_rssi) < abs(old_rssi):
                 current["rssi"] = new_rssi
                 current["ant"] = tag.get("ant")
+                current["device"] = device
 
         return current
 

smartx_rfid/webhook/__init__.py

@@ -1 +1,2 @@
 from ._main import WebhookManager
+from .xtrack import WebhookXtrack

smartx_rfid/webhook/_main.py

@@ -1,6 +1,8 @@
 import asyncio
 import logging
 from typing import Optional, Dict, Any
+from datetime import datetime, date
+from decimal import Decimal
 
 import httpx
 
@@ -18,6 +20,66 @@ class WebhookManager:
 
         self.default_headers = {"Content-Type": "application/json", "User-Agent": "SmartX-Connector/1.0"}
 
+    def _make_serializable(self, obj: Any) -> Any:
+        """
+        Converts objects to JSON-serializable format.
+
+        Handles:
+        - datetime/date objects -> ISO format strings
+        - Decimal -> float
+        - Classes with __dict__ -> dict
+        - Sets -> lists
+        - Bytes -> string (decoded)
+        - Iterables -> lists
+
+        Args:
+            obj: Object to convert
+
+        Returns:
+            JSON-serializable version of the object
+        """
+        # Handle None
+        if obj is None:
+            return None
+
+        # Handle datetime and date
+        if isinstance(obj, (datetime, date)):
+            return obj.isoformat()
+
+        # Handle Decimal
+        if isinstance(obj, Decimal):
+            return float(obj)
+
+        # Handle bytes
+        if isinstance(obj, bytes):
+            try:
+                return obj.decode("utf-8")
+            except Exception:
+                return str(obj)
+
+        # Handle sets
+        if isinstance(obj, set):
+            return list(obj)
+
+        # Handle dictionaries (recursively)
+        if isinstance(obj, dict):
+            return {key: self._make_serializable(value) for key, value in obj.items()}
+
+        # Handle lists and tuples (recursively)
+        if isinstance(obj, (list, tuple)):
+            return [self._make_serializable(item) for item in obj]
+
+        # Handle objects with __dict__ (custom classes)
+        if hasattr(obj, "__dict__"):
+            return self._make_serializable(obj.__dict__)
+
+        # Handle primitive types (str, int, float, bool)
+        if isinstance(obj, (str, int, float, bool)):
+            return obj
+
+        # Last resort: convert to string
+        return str(obj)
+
     async def post(
         self, device: str, event_type: str, event_data: Any = None, headers: Optional[Dict[str, str]] = None
     ) -> bool:
@@ -38,7 +100,10 @@ class WebhookManager:
             logging.warning("⚠️ WEBHOOK_URL not configured in settings")
             return False
 
-        payload = {"device": device, "event_type": event_type, "event_data": event_data}
+        # Convert event_data to JSON-serializable format
+        serializable_event_data = self._make_serializable(event_data)
+
+        payload = {"device": device, "event_type": event_type, "event_data": serializable_event_data}
 
         # Merge with custom headers if provided
         if headers:

smartx_rfid/webhook/xtrack.py

@@ -0,0 +1,30 @@
+import logging
+import httpx
+
+
+class WebhookXtrack:
+    def __init__(self, url: str, timeout: int = 5):
+        self.url = url
+        self.timeout = timeout
+
+    async def post(self, tag: dict):
+        try:
+            device = tag.get("device", "unknown")
+            ant = tag.get("ant", "1")
+            epc = tag.get("epc", None)
+            if epc is None:
+                raise Exception("EPC is required")
+            payload = f"""<msg>
+                        <command>ReportRead</command>
+                        <data>EVENT=|DEVICENAME={device}|ANTENNANAME={ant}|TAGID={epc}|</data>
+                        <cmpl>STATE=|DATA1=|DATA2=|DATA3=|DATA4=|DATA5=|</cmpl>
+                        </msg>"""
+            async with httpx.AsyncClient() as client:
+                await client.post(
+                    self.url,
+                    content=payload,
+                    headers={"Content-Type": "application/xml"},
+                    timeout=self.timeout,
+                )
+        except Exception as e:
+            logging.info(f"Error Xtrack: {e}")

{smartx_rfid-1.5.4.dist-info → smartx_rfid-1.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: smartx-rfid
-Version: 1.5.4
+Version: 1.8.0
 Summary: SmartX RFID library
 License: MIT
 License-File: LICENSE

{smartx_rfid-1.5.4.dist-info → smartx_rfid-1.8.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
-smartx_rfid/__init__.py,sha256=XCdKdP8o5LT3VjJtWOuFHJzztc0FXt3Ms89qsx0p6sM,282
+smartx_rfid/__init__.py,sha256=zNs6ASi3rUxNcqxcaNHx7DicO5Z1QHs3twVoxQZQCT4,274
 smartx_rfid/clients/rchlo.py,sha256=z2xT9YnNEwkbHSeHsJD9BZvSJZ5QtnHZ9R7SpQ21Jxk,221
 smartx_rfid/db/__init__.py,sha256=P8rsrVgc_5NDMH_p4FDs5OBLe3ohaQNR_sadVaeNvxA,35
 smartx_rfid/db/_main.py,sha256=pKzJnkTb6VVSbKd8E34us4SAAKxyTGsE_diE_AxJShY,15450
-smartx_rfid/devices/RFID/R700_IOT/_main.py,sha256=VL2yDBCXp8Avb3PXKZyBNwtBRhwlLQb5TSs3aTUeC6w,7458
+smartx_rfid/devices/RFID/R700_IOT/_main.py,sha256=wBPW5j_8WB_f4AzVzEDIEjhiqCt8Jhhi9M8cVByefIE,7353
 smartx_rfid/devices/RFID/R700_IOT/on_event.py,sha256=bG_33gY2ZHXquUbezXyMN0dyHO9SBwc36DPTc8iXc1U,799
 smartx_rfid/devices/RFID/R700_IOT/reader_config_example.py,sha256=oi4vg3_zjYFDUeq1Y_d5InUx_Rq5M2CB5RDVkK3WCgU,2264
 smartx_rfid/devices/RFID/R700_IOT/reader_helpers.py,sha256=8CvvYeKGplWqceVH5mEMN2_lA2Qgw7Wo1jpYuXLQlXo,5940
@@ -10,7 +10,7 @@ smartx_rfid/devices/RFID/R700_IOT/write_commands.py,sha256=GMROeq_daTScj4NZygF45
 smartx_rfid/devices/RFID/X714/_main.py,sha256=LP1X_w6Sy9m5kHLvbaRUNZbzQJU37fS8OIEWvOfrk7M,6371
 smartx_rfid/devices/RFID/X714/ble_protocol.py,sha256=M3Cs66WX6oa_EPdMTLEjD-IRxAjpfrKzGj4hn1vxlxQ,6951
 smartx_rfid/devices/RFID/X714/on_receive.py,sha256=frrZIwSSDrsOjLO2GHdShVhoC-2VvHtr_AkJU91VDIo,2133
-smartx_rfid/devices/RFID/X714/rfid.py,sha256=XgHl2evlN3tGB6hhCUYzpEy_jw2dyplxUcDYsuPec2Q,2285
+smartx_rfid/devices/RFID/X714/rfid.py,sha256=-YypTMhKuXJlzLYiMRvzTFL8bdvfJYTcpSMwp2TOEvI,2339
 smartx_rfid/devices/RFID/X714/serial_protocol.py,sha256=eOGM5sK35SxXfS9KjB8JQzYhR1qs4H3vw3-n3oPOjQQ,3681
 smartx_rfid/devices/RFID/X714/tcp_protocol.py,sha256=GthynyN6YMl6R16nrAnlrDK61QnuZAOhYhPqycBCwJA,4804
 smartx_rfid/devices/RFID/X714/write_commands.py,sha256=tKLTATb4vDkghpw5rQuJwcnPNkViT4753fwToNPfKh0,1304
@@ -25,15 +25,16 @@ smartx_rfid/parser/rfid_tag_parser/exceptions.py,sha256=QsiXv0IHGYsLhYGgx2D-yE0j
 smartx_rfid/parser/rfid_tag_parser/tag_tid_parser.py,sha256=uw-h7sYrH4Tfum_E9FyCRQKQMBlr5Igtjab99sJwxvA,23396
 smartx_rfid/schemas/events.py,sha256=1iX0iSGirMqDbUAi2ir1CDhtVp8ROg-KZ6tY5nppWek,243
 smartx_rfid/schemas/tag.py,sha256=haMvu_ALhkba8AIL-DrQN0egkRqeP3Wr8AyzyOnWH4Q,2242
-smartx_rfid/utils/__init__.py,sha256=TllHEfkXJjmBwdwjPJqzbPn4hfCeqmTNOw6vHgzC-wU,101
+smartx_rfid/utils/__init__.py,sha256=5--umtdkwvp7YuOFW34aHq1YymP72aFEX0XVg30BneY,101
 smartx_rfid/utils/event.py,sha256=7QOdiSfiMscoAaTq4U3E3asYGSVnolr9OD3FSYGh6bg,469
 smartx_rfid/utils/logger_manager.py,sha256=61HJ40wgX0hVwG4xW66IQ2jdJp8CFM_S0eoGzx8-FwU,5653
 smartx_rfid/utils/path.py,sha256=eRxXKNzzDELna3USfGPNG1EPP2EkLlFxHmf21BMWAgA,3792
 smartx_rfid/utils/regex.py,sha256=vxMR0PbZ6JxRHk2AAA9L3z98uZgrsVqslDFLcxC7P9Q,243
-smartx_rfid/utils/tag_list.py,sha256=_AP0ITue9JHTaDBGC2VYjXfr6qcJZQdEHm0Yp2sC_-8,6550
-smartx_rfid/webhook/__init__.py,sha256=IO_xPVNOfY8nsE60yajjbXqyqVR66BIFuQoNMuKY_j4,34
-smartx_rfid/webhook/_main.py,sha256=FyP5-jFnT9_27_3Sa3ltpeQ4FkC9vlajzzrObXQmmzY,3213
-smartx_rfid-1.5.4.dist-info/METADATA,sha256=QH-nnV_HQyWUhDq1uHeLbJM0fBZe0cnzatbNykHOJZM,8705
-smartx_rfid-1.5.4.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-smartx_rfid-1.5.4.dist-info/licenses/LICENSE,sha256=npGJO3HuHM3JdFNEXv1jRmP_wRYq9-ujkqJPmLxrtEw,1080
-smartx_rfid-1.5.4.dist-info/RECORD,,
+smartx_rfid/utils/tag_list.py,sha256=Kf96VIhxAjAgHAMnQrtmnElcyY3b3DovAxydVuPKdWU,7123
+smartx_rfid/webhook/__init__.py,sha256=cSJmsEI-iofZ1RQHHuPixyAQBts8cHepk7DY4nI-b7E,68
+smartx_rfid/webhook/_main.py,sha256=gdOun2maK3iMfxCDYRLkkMp9NfmdRXbIrsXtmEv7arY,5118
+smartx_rfid/webhook/xtrack.py,sha256=mU0akq4RxefloJcchhpmaG8SFdJ-Rert8G32X0oMikA,1068
+smartx_rfid-1.8.0.dist-info/METADATA,sha256=3QXOy0qpKaQcEsZddG_fFXclXfxgvixEHPEMsSh9pWU,8705
+smartx_rfid-1.8.0.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
+smartx_rfid-1.8.0.dist-info/licenses/LICENSE,sha256=npGJO3HuHM3JdFNEXv1jRmP_wRYq9-ujkqJPmLxrtEw,1080
+smartx_rfid-1.8.0.dist-info/RECORD,,

{smartx_rfid-1.5.4.dist-info → smartx_rfid-1.8.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.2.1
+Generator: poetry-core 2.3.0
 Root-Is-Purelib: true
 Tag: py3-none-any