labfreed 1.0.0a11__py3-none-any.whl → 1.0.0a13__py3-none-any.whl

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/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/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/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/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/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:

{labfreed-1.0.0a11.dist-info → labfreed-1.0.0a13.dist-info}/METADATA

@@ -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.dist-info → labfreed-1.0.0a13.dist-info}/RECORD

@@ -1,6 +1,6 @@
-labfreed/__init__.py,sha256=Av3vixNTNkUV8H8oi-fZ3iwAwsFx6NvLgisFqsGX5NA,339
+labfreed/__init__.py,sha256=ZD4Xdez3D9Q8vES6HwnhQRgC-TUUk7jZbB2-aTkwgiE,339
 labfreed/labfreed_infrastructure.py,sha256=YZmU-kgopyB1tvpTR_k_uIt1Q2ezexMrWvu-HaP65IE,10104
-labfreed/labfreed_extended/app/app_infrastructure.py,sha256=F5UHHt8-r7jigQudOsJ-yV4lWKHFsxNhI4uGP_h53lE,4035
+labfreed/labfreed_extended/app/app_infrastructure.py,sha256=mb1d4QXpwoVRjpn-gZeOmbZ4Uyp17TZy-2dp-849Z7A,4032
 labfreed/labfreed_extended/app/formatted_print.py,sha256=DcwWP0ix1e_wYNIdceIp6cETkJdG2DqpU8Gs3aZAL40,1930
 labfreed/labfreed_extended/app/pac_info/pac_info.py,sha256=hsJunO4adKcLi7PBZNAJYeqzOH31_j95JzuvEV8lNVY,6427
 labfreed/labfreed_extended/app/pac_info/html_renderer/external-link.svg,sha256=H5z9s4VvHq09UnHdqfrYNsx-Whljc0gE4qKJ6-3kfgQ,1158
@@ -27,7 +27,7 @@ labfreed/pac_attributes/server/translation_data_sources.py,sha256=axALOqfP840sOS
 labfreed/pac_cat/__init__.py,sha256=KNPtQzBD1XVohvG_ucOs7RJj-oi6biUTGB1k-T2o6pk,568
 labfreed/pac_cat/category_base.py,sha256=D7BzsdF0-JIgag5L2XZJRF4T2LOH5RLh1MMszflkmV8,2526
 labfreed/pac_cat/pac_cat.py,sha256=wcb_fhvgjS2xmqTsxS8_Oibvr1nsQt5zr8aUajLfK1E,5578
-labfreed/pac_cat/predefined_categories.py,sha256=U1Phgy-q4VKbMv3ruoa8uKKTlxkpZOKnWPqtHLzYUqU,11105
+labfreed/pac_cat/predefined_categories.py,sha256=r2i1lab0pN1A1NJmqyZ0zRfI9AXUW1FCpE71DOIoRhQ,11922
 labfreed/pac_id/__init__.py,sha256=NGMbzkwQ4txKeT5pxdIZordwHO8J3_q84jzPanjKoHg,675
 labfreed/pac_id/extension.py,sha256=NgLexs1LbRMMm4ETrn5m4EY2iWoMDgOTb0UV556jatQ,2227
 labfreed/pac_id/id_segment.py,sha256=r5JU1SJuRXhZJJxy5T3xjrb598wIDTLpivSJhIUAzjQ,4526
@@ -36,9 +36,9 @@ labfreed/pac_id/url_parser.py,sha256=F3SPiscfbPwZ0uMzgirJ1vwgaXclN546lBW46Ywo3nk
 labfreed/pac_id/url_serializer.py,sha256=01LB30pNMBtv2rYHsiE_4Ga2iVA515Boj4ikOIYhiBQ,3511
 labfreed/pac_id_resolver/__init__.py,sha256=RNBlrDOSR42gmSNH9wJVhK_xwEX45cvTKVgWW2bjh7Q,113
 labfreed/pac_id_resolver/cit_common.py,sha256=jzoDOxog8YW68q7vyvDGCZcVcgIzJHXlMt8KwgVnx6o,2885
-labfreed/pac_id_resolver/cit_v1.py,sha256=TVvOWJA6-wmBkwzoHBqNuwV-tndRTSKAK07k56eoJBU,9326
-labfreed/pac_id_resolver/cit_v2.py,sha256=iDEvUb9A3ocX_ijewTIK3p951CIESnKyI7upjrd3Vjw,11842
-labfreed/pac_id_resolver/resolver.py,sha256=IxI57XRZfGHZigym6_f5tnt3ycwU5LnfXs5n1D9pPDs,3077
+labfreed/pac_id_resolver/cit_v1.py,sha256=ix4X36tI422p4lRdlyZxDVEWL_AAEcDwH_eGkSpiDSM,9714
+labfreed/pac_id_resolver/cit_v2.py,sha256=4O3jEqOcUY547HjO2n_JTYu7Nv7QnWAdCQmc4HMWnPQ,12237
+labfreed/pac_id_resolver/resolver.py,sha256=rIG6zM7K5nh6DdN1RuyuxsOOI9R-jhI9hDQgvOkcAy8,3079
 labfreed/pac_id_resolver/services.py,sha256=vtnxLm38t4PNOf73cXh6UZOtWZZOGxfBCfXUDRxGHog,2592
 labfreed/qr/__init__.py,sha256=fdKwP6W2Js--yMbBUdn-g_2uq2VqPpfQJeDLHsMDO-Y,61
 labfreed/qr/generate_qr.py,sha256=mSt-U872O3ReHB_UdS-MzYu0wRgdlKcAOEfTxg5CLRk,16616
@@ -64,7 +64,7 @@ labfreed/well_known_keys/labfreed/well_known_keys.py,sha256=p-hXwEEIs7p2SKn9DQeL
 labfreed/well_known_keys/unece/UneceUnits.json,sha256=kwfQSp_nTuWbADfBBgqTWrvPl6XtM5SedEVLbMJrM7M,898953
 labfreed/well_known_keys/unece/__init__.py,sha256=MSP9lmjg9_D9iqG9Yq2_ajYfQSNS9wIT7FXA1c--59M,122
 labfreed/well_known_keys/unece/unece_units.py,sha256=J20d64H69qKDE3XlGdJoXIIh0G-d0jKoiIDsg9an5pk,1655
-labfreed-1.0.0a11.dist-info/licenses/LICENSE,sha256=gHFOv9FRKHxO8cInP3YXyPoJnuNeqrvcHjaE_wPSsQ8,1100
-labfreed-1.0.0a11.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-labfreed-1.0.0a11.dist-info/METADATA,sha256=TsJ8XB7L3jnqS6RmX9GCactdXC8K81axahxQns-bvqs,19741
-labfreed-1.0.0a11.dist-info/RECORD,,
+labfreed-1.0.0a13.dist-info/licenses/LICENSE,sha256=gHFOv9FRKHxO8cInP3YXyPoJnuNeqrvcHjaE_wPSsQ8,1100
+labfreed-1.0.0a13.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+labfreed-1.0.0a13.dist-info/METADATA,sha256=vN86heBPnVQPClE6BPBCPul-Kgo2no0M_OSLjk9mCqI,19741
+labfreed-1.0.0a13.dist-info/RECORD,,