labfreed 1.0.0a11__tar.gz → 1.0.0a13__tar.gz

{labfreed-1.0.0a11 → labfreed-1.0.0a13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: labfreed
-Version: 1.0.0a11
+Version: 1.0.0a13
 Summary: Python implementation of LabFREED building blocks
 Author-email: Reto Thürer <thuerer.r@buchi.com>
 Requires-Python: >=3.11

{labfreed-1.0.0a11 → labfreed-1.0.0a13}/labfreed/__init__.py

@@ -2,7 +2,7 @@
 Python implementation of LabFREED building blocks
 '''
 
-__version__ = "1.0.0a11"
+__version__ = "1.0.0a13"
 
 from labfreed.pac_id import *  # noqa: F403
 from labfreed.pac_cat import * # noqa: F403

{labfreed-1.0.0a11 → labfreed-1.0.0a13}/labfreed/labfreed_extended/app/app_infrastructure.py

@@ -39,7 +39,7 @@ class Labfreed_App_Infrastructure():
         cit = cit_from_str(cit)
         if not cit:
             raise ValueError('the cit could not be parsed. Neither as v1 or v2')
-        self._resolver._cits.append(cit)
+        self._resolver._cits.add(cit)
         
         
     def process_pac(self, pac_url, markup=None):

{labfreed-1.0.0a11 → labfreed-1.0.0a13}/labfreed/pac_cat/predefined_categories.py

@@ -207,7 +207,7 @@ class Processor_Abstract(PredefinedCategory, ABC):
     
     @model_validator(mode='after')
     def _validate_mandatory_fields(self):
-        if not self.id:
+        if not self.processor_instance:
             self._add_validation_message(
                     source=f"Category {self.key}",
                     level = ValidationMsgLevel.ERROR,
@@ -233,6 +233,26 @@ class Processor_Misc(Processor_Abstract):
     ''' Category segments, which are not defined in the specification'''
     
     
+    
+class Misc(Category, ABC):
+    '''@private'''
+    key: str = Field(default='-X', frozen=True)
+    id:str|None =                    Field(              alias='21')
+    additional_segments: list[IDSegment] = Field(default_factory=list, exclude=True)
+    ''' Category segments, which are not defined in the specification'''
+    
+    @model_validator(mode='after')
+    def _validate_mandatory_fields(self):
+        if not self.id:
+            self._add_validation_message(
+                    source=f"Category {self.key}",
+                    level = ValidationMsgLevel.ERROR,
+                    msg=f"Category key {self.key} is missing mandatory field 'ID'",
+                    highlight_pattern = f"{self.key}"
+            )
+        return self
+    
+    
 category_key_to_class_map  = {
         '-MD': Material_Device,
         '-MS': Material_Substance,
@@ -245,5 +265,6 @@ category_key_to_class_map  = {
         '-DS': Data_Static,
         '-DX': Data_Misc,
         '-PS': Processor_Software,
-        '-PX': Processor_Misc
+        '-PX': Processor_Misc,
+        '-X':Misc
 }

{labfreed-1.0.0a11 → labfreed-1.0.0a13}/labfreed/pac_id_resolver/cit_v1.py

@@ -187,6 +187,16 @@ class CIT_v1(LabFREED_BaseModel):
         for e in self.entries:
             s += '\t'.join([e.service_name, e.application_intent, e.service_type.value, e.applicable_if, e.template_url]) + '\n'
         return s
+    
+    # hash and equal are only used to avoid adding the same cit multiple times. 
+    # we can live with some instances, where it does not work 
+    def __hash__(self):
+        return self.model_dump_json().__hash__()
+    
+    def __eq__(self, other):
+        if not isinstance(other, CIT_v1):
+            return False
+        return self.model_dump() == other.model_dump()
 
 
 

{labfreed-1.0.0a11 → labfreed-1.0.0a13}/labfreed/pac_id_resolver/cit_v2.py

@@ -136,6 +136,17 @@ class CIT_v2(LabFREED_BaseModel):
     def __str__(self):
         yml = yaml.dump(self.model_dump()                        )
         return yml
+     
+    # hash and equal are only used to avoid adding the same cit multiple times. 
+    # we can live with some instances, where it does not work 
+    def __hash__(self):
+        return self.model_dump_json().__hash__()
+    
+    def __eq__(self, other):
+        if not isinstance(other, CIT_v2):
+            return False
+        return self.model_dump() == other.model_dump()
+    
     
     def evaluate_pac_id(self, pac):
         pac_id_json = pac.to_dict()

{labfreed-1.0.0a11 → labfreed-1.0.0a13}/labfreed/pac_id_resolver/resolver.py

@@ -61,7 +61,7 @@ class PAC_ID_Resolver():
         '''Initialize the resolver with coupling information tables'''
         if not cits:
             cits = []
-        self._cits = cits
+        self._cits = set(cits)
             
         
     def resolve(self, pac_id:PAC_ID|str, check_service_status=True, use_issuer_cit=True) -> list[ServiceGroup]:
@@ -80,7 +80,7 @@ class PAC_ID_Resolver():
         cits = self._cits.copy()
         if use_issuer_cit:
             if issuer_cit := _get_issuer_cit(pac_id.issuer):
-                cits.append(issuer_cit)
+                cits.add(issuer_cit)
          
         matches = []
         for cit in cits: