smartx-rfid 1.6.0__tar.gz → 1.7.4__tar.gz

{smartx_rfid-1.6.0 → smartx_rfid-1.7.4}/PKG-INFO

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

{smartx_rfid-1.6.0 → smartx_rfid-1.7.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "smartx-rfid"
-version = "1.6.0"
+version = "1.7.4"
 description = "SmartX RFID library"
 authors = ["Gabriel Henrique Pascon <gh.pascon@gmail.com>"]
 license = "MIT"

{smartx_rfid-1.6.0 → smartx_rfid-1.7.4}/src/smartx_rfid/utils/tag_list.py

@@ -3,7 +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 +13,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 +27,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 +59,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 +104,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 +136,8 @@ 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-1.6.0 → smartx_rfid-1.7.4}/src/smartx_rfid/webhook/__init__.py

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

{smartx_rfid-1.6.0 → smartx_rfid-1.7.4}/src/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-1.6.0 → smartx_rfid-1.7.4}/src/smartx_rfid/webhook/xtrack.py

@@ -9,9 +9,14 @@ class WebhookXtrack:
 
     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={tag.get("device", "")}|ANTENNANAME={tag.get("ant", "")}|TAGID={tag.get("epc", "")}|</data>
+                        <data>EVENT=|DEVICENAME={device}|ANTENNANAME={ant}|TAGID={epc}|</data>
                         <cmpl>STATE=|DATA1=|DATA2=|DATA3=|DATA4=|DATA5=|</cmpl>
                         </msg>"""
             async with httpx.AsyncClient() as client:

{smartx_rfid-1.6.0 → smartx_rfid-1.7.4}/src/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