DLMS-SPODES 0.87.15__tar.gz → 0.87.17__tar.gz

{dlms_spodes-0.87.15 → dlms_spodes-0.87.17}/.github/workflows/publish.yml

@@ -4,13 +4,20 @@ on:
   push:
     tags:
       - 'v*'
+  workflow_dispatch:  # manual
+
+permissions:  # For Trusted Publishing
+  id-token: write
+  contents: read
 
 jobs:
   publish:
     runs-on: ubuntu-latest
-    
+    environment: pypi
+
     steps:
-    - uses: actions/checkout@v4
+    - name: Checkout code
+      uses: actions/checkout@v4
     
     - name: Set up Python
       uses: actions/setup-python@v4
@@ -28,4 +35,7 @@ jobs:
     - name: Publish to PyPI
       uses: pypa/gh-action-pypi-publish@release/v1
       with:
-        password: ${{ secrets.PYPI_API_TOKEN }}
+        attestations: true  # Включаем аттестации
+        verbose: true
+      # with:                                               # token version
+      #   password: ${{ secrets.PYPI_API_TOKEN }}

{dlms_spodes-0.87.15 → dlms_spodes-0.87.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DLMS_SPODES
-Version: 0.87.15
+Version: 0.87.17
 Summary: dlms-spodes
 Author-email: Serj Kotilevski <youserj@outlook.com>
 Project-URL: Source, https://github.com/youserj/DlmsSPODES-project

{dlms_spodes-0.87.15 → dlms_spodes-0.87.17}/pyproject.toml

@@ -14,7 +14,7 @@ exclude = ["test","KPZ"]
 
 [project]
 name = "DLMS_SPODES"
-version = "0.87.15"
+version = "0.87.17"
 authors = [
     {name="Serj Kotilevski", email="youserj@outlook.com"}
 ]

{dlms_spodes-0.87.15 → dlms_spodes-0.87.17}/src/DLMS_SPODES/cosem_interface_classes/collection.py

@@ -1001,7 +1001,7 @@ class Collection:
                             case (ClassID.PROFILE_GENERIC, 3, _) | (ClassID.PROFILE_GENERIC, 6):
                                 a_val: structs.CaptureObjectDefinition
                                 obj = self.get_object(a_val.logical_name)
-                                rep.msg = F"{get_name(a_val.logical_name)}.{obj.get_attr_element(int(a_val.attribute_index))}"
+                                rep.msg = F"{get_name(a_val.logical_name, self.spec_map)}.{obj.get_attr_element(int(a_val.attribute_index))}"
                             case _:
                                 pass
                 rep.log = cdt.Log(logging.INFO)
@@ -1040,7 +1040,7 @@ class Collection:
                             case (ClassID.PROFILE_GENERIC, 3, _) | (ClassID.PROFILE_GENERIC, 6):
                                 data: structs.CaptureObjectDefinition
                                 obj = self.get_object(data.logical_name)
-                                rep.msg = F"{get_name(data.logical_name)}.{obj.get_attr_element(int(data.attribute_index))}"
+                                rep.msg = F"{get_name(data.logical_name, self.spec_map)}.{obj.get_attr_element(int(data.attribute_index))}"
                             case _:
                                 pass
                 rep.log = cdt.Log(logging.INFO)
@@ -1353,7 +1353,7 @@ class Collection:
     @lru_cache(4)
     def get_association_id(self, client_sap: enums.ClientSAP) -> int:
         """return id(association instance) from it client address without current"""
-        for ass in get_filtered(iter(self), (ln_pattern.NON_CURRENT_ASSOCIATION,)):
+        for ass in get_filtered(iter(self), (ln_pattern.ASSOCIATION,)):
             if ass.associated_partners_id.client_SAP == client_sap:
                 return ass.logical_name.e
             else:
@@ -1432,7 +1432,7 @@ class Collection:
         """ return names and type of element from collection"""
         names: list[str] = list()
         obj = self.par2obj(Parameter(value.logical_name.contents)).unwrap()
-        names.append(get_name(obj.logical_name))
+        names.append(get_name(obj.logical_name, self.spec_map))
         attr_index = int(value.attribute_index)
         data_index = int(value.data_index)
         data_type: Type[cdt.CommonDataType] = obj.get_attr_data_type(attr_index)

{dlms_spodes-0.87.15 → dlms_spodes-0.87.17}/src/DLMS_SPODES/cosem_interface_classes/profile_generic/ver0.py

@@ -33,6 +33,14 @@ class SortMethod(cdt.Enum, elements=(1, 2, 3, 4, 5, 6)):
     """sort_method"""
 
 
+class GetBufferByIndex(cdt.Structure):
+    """get_buffer_by_index"""
+    from_index: cdt.DoubleLongUnsigned
+    to_index: cdt.DoubleLongUnsigned
+    selected_values: cdt.Array
+    
+
+
 class ProfileGeneric(ic.COSEMInterfaceClasses):
     """5.3.1 Profile generic"""
     CLASS_ID = ClassID.PROFILE_GENERIC
@@ -56,6 +64,9 @@ class ProfileGeneric(ic.COSEMInterfaceClasses):
     M_ELEMENTS = (
         ic.ICMElement("reset", integers.Only0),
         ic.ICMElement("capture", integers.Only0),
+        ic.ICMElement("write", cdt.Structure),  # todo: make anyhow
+        ic.ICMElement("get_buffer_by_range", integers.Only0),
+        ic.ICMElement("get_buffer_by_index", integers.Only0)
         # more 2 elements
     )
 

{dlms_spodes-0.87.15 → dlms_spodes-0.87.17}/src/DLMS_SPODES.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DLMS_SPODES
-Version: 0.87.15
+Version: 0.87.17
 Summary: dlms-spodes
 Author-email: Serj Kotilevski <youserj@outlook.com>
 Project-URL: Source, https://github.com/youserj/DlmsSPODES-project