labfreed 1.0.0a4__py3-none-any.whl → 1.0.0a6__py3-none-any.whl

labfreed/__init__.py

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

labfreed/pac_cat/category_base.py

@@ -57,7 +57,7 @@ class Category(LabFREED_BaseModel):
                     k = f"{field_name}"
             out.update({k : v } ) 
             
-        for s in getattr(self, 'additional_segments'):
+        for s in getattr(self, 'additional_segments', []):
             out.update( {s.key or '' : s.value })
         return out
 

labfreed/pac_cat/predefined_categories.py

@@ -116,9 +116,9 @@ class Material_Consumable(PredefinedCategory):
         return self
     
 class Material_Misc(Material_Consumable):
-    '''Represents the -MC category'''
+    '''Represents the -MX category'''
     # same fields as Consumable
-    key: str = Field(default='-MM', frozen=True)
+    key: str = Field(default='-MX', frozen=True)
     product_number:str|None =   Field(              alias='240')
     batch_number:str|None =     Field(default=None, alias='10')
     packaging_size:str|None =     Field(default=None, alias='20')
@@ -187,15 +187,63 @@ class Data_Static(Data_Abstract):
     additional_segments: list[IDSegment] = Field(default_factory=list, exclude=True)
     ''' Category segments, which are not defined in the specification'''
     
+class Data_Misc(Data_Abstract):
+    '''Represents the -DX category'''
+    key: str = Field(default='-DX', 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'''
+    
+
+
+
+class Processor_Abstract(PredefinedCategory, ABC):
+    '''@private'''
+    key: str
+    processor_instance:str|None =                    Field(              alias='21')
+    processor_code:str|None =                        Field(              alias='240')
+    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 'processor instance'",
+                    highlight_pattern = f"{self.key}"
+            )
+        return self
+
+class Processor_Software(Processor_Abstract):
+    '''Represents the -PS category'''
+    key: str = Field(default='-PS', frozen=True)
+    processor_instance:str|None =                    Field(              alias='21')
+    processor_code:str|None =                        Field(              alias='240')
+    additional_segments: list[IDSegment] = Field(default_factory=list, exclude=True)
+    ''' Category segments, which are not defined in the specification'''
+
+class Processor_Misc(Processor_Abstract):
+    '''Represents the -PX category'''
+    key: str = Field(default='-PX', frozen=True)
+    processor_instance:str|None =                    Field(              alias='21')
+    processor_code:str|None =                        Field(              alias='240')
+    additional_segments: list[IDSegment] = Field(default_factory=list, exclude=True)
+    ''' Category segments, which are not defined in the specification'''
+    
     
 category_key_to_class_map  = {
         '-MD': Material_Device,
         '-MS': Material_Substance,
         '-MC': Material_Consumable,
-        '-MM': Material_Misc,
+        '-MX': Material_Misc,
         '-DM': Data_Method,
         '-DR': Data_Result,
         '-DC': Data_Calibration,
         '-DP': Data_Progress,
-        '-DS': Data_Static 
+        '-DS': Data_Static,
+        '-DX': Data_Misc,
+        '-PS': Processor_Software,
+        '-PX': Processor_Misc
 }

{labfreed-1.0.0a4.dist-info → labfreed-1.0.0a6.dist-info}/METADATA

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

{labfreed-1.0.0a4.dist-info → labfreed-1.0.0a6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-labfreed/__init__.py,sha256=KvTe62tzFkrePSSCB795dWb5vRFo6eLISovRwLNjT50,338
+labfreed/__init__.py,sha256=QDD9hO42SH5U1i2nyJ30gD2f7LQKcGLPuewQwzxIxXQ,338
 labfreed/labfreed_infrastructure.py,sha256=YZmU-kgopyB1tvpTR_k_uIt1Q2ezexMrWvu-HaP65IE,10104
 labfreed/labfreed_extended/app/app_infrastructure.py,sha256=qn6KesHiOrhTPgXwMZNqFArKlWluxFbk5bgp5u8KDb8,3990
 labfreed/labfreed_extended/app/formatted_print.py,sha256=DcwWP0ix1e_wYNIdceIp6cETkJdG2DqpU8Gs3aZAL40,1930
@@ -25,9 +25,9 @@ labfreed/pac_attributes/server/attribute_data_sources.py,sha256=gfaERhFrn3SIoSNR
 labfreed/pac_attributes/server/server.py,sha256=_Rzi_vzX02o0g03lbm-fdg5AJHJnESDWD7cJEKRFs8w,8841
 labfreed/pac_attributes/server/translation_data_sources.py,sha256=axALOqfP840sOSdVCRYtrens97mm-hpfONMUyuVlCrY,2145
 labfreed/pac_cat/__init__.py,sha256=KNPtQzBD1XVohvG_ucOs7RJj-oi6biUTGB1k-T2o6pk,568
-labfreed/pac_cat/category_base.py,sha256=wVejYgDnUIUQ71q05ctophtZY2w9fD-PZ0xk3wUAEkQ,2522
+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=5wnMCj-CrACV2W4lH13w7qynWIwi506G3uLNcxuJQGg,8832
+labfreed/pac_cat/predefined_categories.py,sha256=U1Phgy-q4VKbMv3ruoa8uKKTlxkpZOKnWPqtHLzYUqU,11105
 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
@@ -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.0a4.dist-info/licenses/LICENSE,sha256=gHFOv9FRKHxO8cInP3YXyPoJnuNeqrvcHjaE_wPSsQ8,1100
-labfreed-1.0.0a4.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-labfreed-1.0.0a4.dist-info/METADATA,sha256=Qn-9eoDdKw6CvJjtaMHWsfShqNI1iqYQkA65GM8A1UA,19740
-labfreed-1.0.0a4.dist-info/RECORD,,
+labfreed-1.0.0a6.dist-info/licenses/LICENSE,sha256=gHFOv9FRKHxO8cInP3YXyPoJnuNeqrvcHjaE_wPSsQ8,1100
+labfreed-1.0.0a6.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+labfreed-1.0.0a6.dist-info/METADATA,sha256=llcvfZgrszwp3i_ayvI5HSqO72pp7vRhJZ07-SKUp70,19740
+labfreed-1.0.0a6.dist-info/RECORD,,