labfreed 0.2.11__tar.gz → 0.3.0a0__tar.gz

{labfreed-0.2.11 → labfreed-0.3.0a0}/CHANGELOG.md

@@ -1,4 +1,7 @@
 ## Change Log
+### v0.2.12
+- bugfix:no warning message if PAC-CAT has same segment key in two segments
+
 ### v0.2.11
 - bugfix:added missing well known segment key '250'
   

{labfreed-0.2.11 → labfreed-0.3.0a0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: labfreed
-Version: 0.2.11
+Version: 0.3.0a0
 Summary: Python implementation of LabFREED building blocks
 Author-email: Reto Thürer <thuerer.r@buchi.com>
 Requires-Python: >=3.11
@@ -28,16 +28,23 @@ Requires-Dist: pytest>=8.3.5 ; extra == "dev"
 Requires-Dist: pdoc>=15.0.1 ; extra == "dev"
 Requires-Dist: flit>=3.12.0 ; extra == "dev"
 Requires-Dist: ruff>=0.11.5 ; extra == "dev"
+Requires-Dist: Flask>=3.1.1 ; extra == "extended"
+Requires-Dist: openpyxl>=3.1.5 ; extra == "extended"
 Project-URL: Documentation, https://github.com/retothuerer/LabFREED?tab=readme-ov-file#readme
 Project-URL: Homepage, https://github.com/retothuerer/LabFREED
 Project-URL: Source, https://github.com/retothuerer/LabFREED
 Project-URL: Tracker, https://github.com/retothuerer/LabFREED/issues
 Provides-Extra: dev
+Provides-Extra: extended
 
 # LabFREED for Python
 
 [![PyPI](https://img.shields.io/pypi/v/labfreed.svg)](https://pypi.org/project/labfreed/) ![Python Version](https://img.shields.io/pypi/pyversions/labfreed) [![Test Labfreed](https://github.com/retothuerer/LabFREED/actions/workflows/run-tests.yml/badge.svg)](https://github.com/retothuerer/LabFREED/actions/workflows/run-tests.yml) [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE) 
 
+<!--
+[![Ruff](https://img.shields.io/badge/style-Ruff-black?logo=ruff&labelColor=gray)](https://github.com/astral-sh/ruff)
+-->
+
 
 This is a Python implementation of [LabFREED](https://labfreed.org/) building blocks.
 
@@ -103,28 +110,32 @@ There is a nice function to highlight problems
 pac.print_validation_messages()
 ```
 ```text
->> Validation Results                                                                                                                   
->> ┌───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
->> │ **RECOMMENDATION** in id segment value bal500                                                                                     │
->> │ Characters 'l','a','b' should not be used., Characters SHOULD be limited to upper case letters (A-Z), numbers (0-9), '-' and '+'  │
->> │                                                                                                                                   │
->> │ HTTPS://PAC.METTORIUS.COM/-MD/👉bal👈500/@1234                                                                                    │
->> ├───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
->> │ **RECOMMENDATION** in id segment value @1234                                                                                      │
->> │ Characters '@' should not be used., Characters SHOULD be limited to upper case letters (A-Z), numbers (0-9), '-' and '+'          │
->> │                                                                                                                                   │
->> │ HTTPS://PAC.METTORIUS.COM/-MD/bal500/👉@👈1234                                                                                    │
->> ├───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
->> │ **RECOMMENDATION** in id segment value bal500                                                                                     │
->> │ Characters 'l','a','b' should not be used., Characters SHOULD be limited to upper case letters (A-Z), numbers (0-9), '-' and '+'  │
->> │                                                                                                                                   │
->> │ HTTPS://PAC.METTORIUS.COM/-MD/👉bal👈500/@1234                                                                                    │
->> ├───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
->> │ **RECOMMENDATION** in id segment value @1234                                                                                      │
->> │ Characters '@' should not be used., Characters SHOULD be limited to upper case letters (A-Z), numbers (0-9), '-' and '+'          │
->> │                                                                                                                                   │
->> │ HTTPS://PAC.METTORIUS.COM/-MD/bal500/👉@👈1234                                                                                    │
->> └───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+>> Validation Results                                                                                                     
+>> ┌─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+>> │ **RECOMMENDATION** in id segment value bal500                                                                       │
+>> │ Characters 'a','l','b' should not be used., Characters SHOULD be limited to upper case letters (A-Z), numbers       │
+>> │ (0-9), '-' and '+'                                                                                                  │
+>> │                                                                                                                     │
+>> │ HTTPS://PAC.METTORIUS.COM/-MD/👉bal👈500/@1234                                                                      │
+>> ├─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
+>> │ **RECOMMENDATION** in id segment value @1234                                                                        │
+>> │ Characters '@' should not be used., Characters SHOULD be limited to upper case letters (A-Z), numbers (0-9), '-'    │
+>> │ and '+'                                                                                                             │
+>> │                                                                                                                     │
+>> │ HTTPS://PAC.METTORIUS.COM/-MD/bal500/👉@👈1234                                                                      │
+>> ├─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
+>> │ **RECOMMENDATION** in id segment value bal500                                                                       │
+>> │ Characters 'a','l','b' should not be used., Characters SHOULD be limited to upper case letters (A-Z), numbers       │
+>> │ (0-9), '-' and '+'                                                                                                  │
+>> │                                                                                                                     │
+>> │ HTTPS://PAC.METTORIUS.COM/-MD/👉bal👈500/@1234                                                                      │
+>> ├─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
+>> │ **RECOMMENDATION** in id segment value @1234                                                                        │
+>> │ Characters '@' should not be used., Characters SHOULD be limited to upper case letters (A-Z), numbers (0-9), '-'    │
+>> │ and '+'                                                                                                             │
+>> │                                                                                                                     │
+>> │ HTTPS://PAC.METTORIUS.COM/-MD/bal500/👉@👈1234                                                                      │
+>> └─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
 ```
 ### Save as QR Code
 
@@ -249,7 +260,7 @@ trex.print_validation_messages()
 >> Validation Results                                            
 >> ┌────────────────────────────────────────────────────────────┐
 >> │ **ERROR** in TREX table column Date                        │
->> │ Column header key contains invalid characters: 'e','t','a' │
+>> │ Column header key contains invalid characters: 'a','t','e' │
 >> │                                                            │
 >> │ STOP$T.D:20240505T1306                                     │
 >> │ +TEMP$KEL:10.15                                            │
@@ -257,9 +268,9 @@ trex.print_validation_messages()
 >> │ +COMMENT$T.A:FOO                                           │
 >> │ +COMMENT2$T.T:12G3                                         │
 >> │ +TABLE$$DURATION$HUR:D👉ate👈$T.D:OK$T.B:COMMENT$T.A::     │
->> │  1:20250522T163256.043:T:FOO::                             │
->> │  1.1:20250522T163256.043:T:BAR::                           │
->> │  1.3:20250522T163256.043:F:BLUBB                           │
+>> │  1:20250522T180101.575:T:FOO::                             │
+>> │  1.1:20250522T180101.575:T:BAR::                           │
+>> │  1.3:20250522T180101.575:F:BLUBB                           │
 >> └────────────────────────────────────────────────────────────┘
 ```
 #### Combine PAC-ID and TREX and serialize
@@ -271,7 +282,7 @@ pac_str = pac.to_url()
 print(pac_str)
 ```
 ```text
->> HTTPS://PAC.METTORIUS.COM/21:1234*MYTREX$TREX/STOP$T.D:20240505T1306+TEMP$KEL:10.15+OK$T.B:F+COMMENT$T.A:FOO+COMMENT2$T.T:12G3+TABLE$$DURATION$HUR:Date$T.D:OK$T.B:COMMENT$T.A::1:20250522T163256.043:T:FOO::1.1:20250522T163256.043:T:BAR::1.3:20250522T163256.043:F:BLUBB
+>> HTTPS://PAC.METTORIUS.COM/21:1234*MYTREX$TREX/STOP$T.D:20240505T1306+TEMP$KEL:10.15+OK$T.B:F+COMMENT$T.A:FOO+COMMENT2$T.T:12G3+TABLE$$DURATION$HUR:Date$T.D:OK$T.B:COMMENT$T.A::1:20250522T180101.575:T:FOO::1.1:20250522T180101.575:T:BAR::1.3:20250522T180101.575:F:BLUBB
 ```
 ## PAC-ID Resolver
 
@@ -332,9 +343,12 @@ for sg in service_groups:
 
 <!-- BEGIN CHANGELOG -->
 ## Change Log
+### v0.2.12
+- bugfix:no warning message if PAC-CAT has same segment key in two segments
+
 ### v0.2.11
 - bugfix:added missing well known segment key '250'
-
+  
 ### v0.2.10
 - bugfix:added missing well known segment key '20'
   

{labfreed-0.2.11 → labfreed-0.3.0a0}/README.md

@@ -2,6 +2,10 @@
 
 [![PyPI](https://img.shields.io/pypi/v/labfreed.svg)](https://pypi.org/project/labfreed/) ![Python Version](https://img.shields.io/pypi/pyversions/labfreed) [![Test Labfreed](https://github.com/retothuerer/LabFREED/actions/workflows/run-tests.yml/badge.svg)](https://github.com/retothuerer/LabFREED/actions/workflows/run-tests.yml) [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE) 
 
+<!--
+[![Ruff](https://img.shields.io/badge/style-Ruff-black?logo=ruff&labelColor=gray)](https://github.com/astral-sh/ruff)
+-->
+
 
 This is a Python implementation of [LabFREED](https://labfreed.org/) building blocks.
 
@@ -67,28 +71,32 @@ There is a nice function to highlight problems
 pac.print_validation_messages()
 ```
 ```text
->> Validation Results                                                                                                                   
->> ┌───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
->> │ **RECOMMENDATION** in id segment value bal500                                                                                     │
->> │ Characters 'l','a','b' should not be used., Characters SHOULD be limited to upper case letters (A-Z), numbers (0-9), '-' and '+'  │
->> │                                                                                                                                   │
->> │ HTTPS://PAC.METTORIUS.COM/-MD/👉bal👈500/@1234                                                                                    │
->> ├───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
->> │ **RECOMMENDATION** in id segment value @1234                                                                                      │
->> │ Characters '@' should not be used., Characters SHOULD be limited to upper case letters (A-Z), numbers (0-9), '-' and '+'          │
->> │                                                                                                                                   │
->> │ HTTPS://PAC.METTORIUS.COM/-MD/bal500/👉@👈1234                                                                                    │
->> ├───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
->> │ **RECOMMENDATION** in id segment value bal500                                                                                     │
->> │ Characters 'l','a','b' should not be used., Characters SHOULD be limited to upper case letters (A-Z), numbers (0-9), '-' and '+'  │
->> │                                                                                                                                   │
->> │ HTTPS://PAC.METTORIUS.COM/-MD/👉bal👈500/@1234                                                                                    │
->> ├───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
->> │ **RECOMMENDATION** in id segment value @1234                                                                                      │
->> │ Characters '@' should not be used., Characters SHOULD be limited to upper case letters (A-Z), numbers (0-9), '-' and '+'          │
->> │                                                                                                                                   │
->> │ HTTPS://PAC.METTORIUS.COM/-MD/bal500/👉@👈1234                                                                                    │
->> └───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+>> Validation Results                                                                                                     
+>> ┌─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+>> │ **RECOMMENDATION** in id segment value bal500                                                                       │
+>> │ Characters 'a','l','b' should not be used., Characters SHOULD be limited to upper case letters (A-Z), numbers       │
+>> │ (0-9), '-' and '+'                                                                                                  │
+>> │                                                                                                                     │
+>> │ HTTPS://PAC.METTORIUS.COM/-MD/👉bal👈500/@1234                                                                      │
+>> ├─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
+>> │ **RECOMMENDATION** in id segment value @1234                                                                        │
+>> │ Characters '@' should not be used., Characters SHOULD be limited to upper case letters (A-Z), numbers (0-9), '-'    │
+>> │ and '+'                                                                                                             │
+>> │                                                                                                                     │
+>> │ HTTPS://PAC.METTORIUS.COM/-MD/bal500/👉@👈1234                                                                      │
+>> ├─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
+>> │ **RECOMMENDATION** in id segment value bal500                                                                       │
+>> │ Characters 'a','l','b' should not be used., Characters SHOULD be limited to upper case letters (A-Z), numbers       │
+>> │ (0-9), '-' and '+'                                                                                                  │
+>> │                                                                                                                     │
+>> │ HTTPS://PAC.METTORIUS.COM/-MD/👉bal👈500/@1234                                                                      │
+>> ├─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
+>> │ **RECOMMENDATION** in id segment value @1234                                                                        │
+>> │ Characters '@' should not be used., Characters SHOULD be limited to upper case letters (A-Z), numbers (0-9), '-'    │
+>> │ and '+'                                                                                                             │
+>> │                                                                                                                     │
+>> │ HTTPS://PAC.METTORIUS.COM/-MD/bal500/👉@👈1234                                                                      │
+>> └─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
 ```
 ### Save as QR Code
 
@@ -213,7 +221,7 @@ trex.print_validation_messages()
 >> Validation Results                                            
 >> ┌────────────────────────────────────────────────────────────┐
 >> │ **ERROR** in TREX table column Date                        │
->> │ Column header key contains invalid characters: 'e','t','a' │
+>> │ Column header key contains invalid characters: 'a','t','e' │
 >> │                                                            │
 >> │ STOP$T.D:20240505T1306                                     │
 >> │ +TEMP$KEL:10.15                                            │
@@ -221,9 +229,9 @@ trex.print_validation_messages()
 >> │ +COMMENT$T.A:FOO                                           │
 >> │ +COMMENT2$T.T:12G3                                         │
 >> │ +TABLE$$DURATION$HUR:D👉ate👈$T.D:OK$T.B:COMMENT$T.A::     │
->> │  1:20250522T163256.043:T:FOO::                             │
->> │  1.1:20250522T163256.043:T:BAR::                           │
->> │  1.3:20250522T163256.043:F:BLUBB                           │
+>> │  1:20250522T180101.575:T:FOO::                             │
+>> │  1.1:20250522T180101.575:T:BAR::                           │
+>> │  1.3:20250522T180101.575:F:BLUBB                           │
 >> └────────────────────────────────────────────────────────────┘
 ```
 #### Combine PAC-ID and TREX and serialize
@@ -235,7 +243,7 @@ pac_str = pac.to_url()
 print(pac_str)
 ```
 ```text
->> HTTPS://PAC.METTORIUS.COM/21:1234*MYTREX$TREX/STOP$T.D:20240505T1306+TEMP$KEL:10.15+OK$T.B:F+COMMENT$T.A:FOO+COMMENT2$T.T:12G3+TABLE$$DURATION$HUR:Date$T.D:OK$T.B:COMMENT$T.A::1:20250522T163256.043:T:FOO::1.1:20250522T163256.043:T:BAR::1.3:20250522T163256.043:F:BLUBB
+>> HTTPS://PAC.METTORIUS.COM/21:1234*MYTREX$TREX/STOP$T.D:20240505T1306+TEMP$KEL:10.15+OK$T.B:F+COMMENT$T.A:FOO+COMMENT2$T.T:12G3+TABLE$$DURATION$HUR:Date$T.D:OK$T.B:COMMENT$T.A::1:20250522T180101.575:T:FOO::1.1:20250522T180101.575:T:BAR::1.3:20250522T180101.575:F:BLUBB
 ```
 ## PAC-ID Resolver
 
@@ -296,9 +304,12 @@ for sg in service_groups:
 
 <!-- BEGIN CHANGELOG -->
 ## Change Log
+### v0.2.12
+- bugfix:no warning message if PAC-CAT has same segment key in two segments
+
 ### v0.2.11
 - bugfix:added missing well known segment key '250'
-
+  
 ### v0.2.10
 - bugfix:added missing well known segment key '20'
   

{labfreed-0.2.11 → labfreed-0.3.0a0}/labfreed/__init__.py

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

{labfreed-0.2.11 → labfreed-0.3.0a0}/labfreed/labfreed_infrastructure.py

@@ -108,7 +108,7 @@ class LabFREED_BaseModel(PDOC_Workaround_Base):
             self._validation_messages.append(w)
 
     # Function to extract warnings from a model and its nested models
-    def _get_nested_validation_messages(self, parent_name: str = "", visited: Set[int] = None) -> List['ValidationMessage']:
+    def _get_nested_validation_messages(self, parent_name: str = "", visited: Set[int]|None = None) -> List['ValidationMessage']:
         """
         Recursively extract warnings from a Pydantic model and its nested fields, including computed fields.
 
@@ -140,7 +140,8 @@ class LabFREED_BaseModel(PDOC_Workaround_Base):
                         warnings_list.extend(item._get_nested_validation_messages(list_path, visited))
 
         # Traverse computed fields
-        computed_fields = getattr(self, '__pydantic_decorators__', {}).computed_fields or {}
+        mdl:BaseModel = getattr(self, '__pydantic_decorators__', {})
+        computed_fields = mdl.computed_fields or {}
         for field_name in computed_fields:
             full_path = f"{parent_name}.{field_name}" if parent_name else field_name
             try:
@@ -255,4 +256,3 @@ def _filter_warnings(val_msg:list[ValidationMessage]) -> list[ValidationMessage]
 def _quote_texts(texts:list[str]):
     return ','.join([f"'{t}'" for t in texts])
 
-

labfreed-0.3.0a0/labfreed/pac_attributes/api_data_models/request.py

@@ -0,0 +1,56 @@
+from typing import   Self
+from pydantic import ConfigDict, model_validator
+from labfreed.labfreed_infrastructure import LabFREED_BaseModel, LabFREED_ValidationError, ValidationMsgLevel
+from labfreed.pac_id.pac_id import PAC_ID
+
+
+class AttributeRequestPayload(LabFREED_BaseModel):
+    model_config = ConfigDict(frozen=True)
+    
+    pac_urls: list[str]
+    language_preferences: list[str]
+    restrict_to_attribute_groups: list[str]|None = None
+    suppress_forward_lookup: bool = False
+    
+    def as_json(self):
+        return self.model_dump_json()
+    
+    @classmethod
+    def from_json(cls, json):
+        return cls.model_validate_json(json)
+    
+    @model_validator(mode="before")
+    @classmethod
+    def _handle_single_pac_url(cls, data):
+        p = data.get('pac_urls')
+        if isinstance(p, str):
+            data['pac_urls'] = [p]
+        return data
+    
+    @model_validator(mode="after")
+    def _validate_pacs(self) -> Self:
+        if len(self.pac_urls) > 100:
+            self._add_validation_message(
+                        source="pacs",
+                        level = ValidationMsgLevel.ERROR,
+                        msg='The number of pac-ids must be limited to 100'
+                    )
+            
+        for pac_url in self.pac_urls:
+            try:
+                PAC_ID.from_url(pac_url)
+            except LabFREED_ValidationError:
+                self._add_validation_message(
+                        source="pacs",
+                        level = ValidationMsgLevel.ERROR,
+                        msg='{pac_url} is not a valid PAC-ID'
+                    )
+                
+        if not self.is_valid:
+            raise LabFREED_ValidationError(message='Invalid request', validation_msgs=self.validation_messages())
+                
+        return self
+    
+    
+    
+

labfreed-0.3.0a0/labfreed/pac_attributes/api_data_models/response.py

@@ -0,0 +1,184 @@
+
+from abc import ABC
+from datetime import  datetime
+import re
+from typing import Annotated, Any,  Literal, Union, get_args
+from labfreed.utilities.ensure_utc_time import ensure_utc
+from labfreed.labfreed_infrastructure import  LabFREED_BaseModel, ValidationMsgLevel, _quote_texts
+from pydantic import   Field, field_validator, model_validator
+
+
+class AttributeBase(LabFREED_BaseModel, ABC):
+    key: str
+    value: Any
+    label: str = ""
+    
+    observed_at: datetime | None = None
+    
+    def __init__(self, **data):
+        # Automatically inject the Literal value for `type`
+        discriminator_value = self._get_discriminator_value()
+        data["type"] = discriminator_value
+        super().__init__(**data)       
+    
+    @field_validator('observed_at', mode='before')
+    def set_utc_observed_at_if_naive(cls, value):
+        if isinstance(value, datetime):
+            return ensure_utc(value)
+        else:
+            return value
+
+    @classmethod
+    def _get_discriminator_value(cls) -> str:
+        """Extract the Literal value from the 'type' annotation."""
+        try:
+            type_annotation = cls.__annotations__["type"]
+            literal_value = get_args(type_annotation)[0]
+            return literal_value
+        except Exception as e:
+            raise TypeError(
+                f"{cls.__name__} must define `type: Literal[<value>]` annotation"
+            ) from e
+        
+
+        
+    
+class ReferenceAttribute(AttributeBase):
+    type: Literal["reference"]
+    value: str
+    
+class DateTimeAttribute(AttributeBase):
+    type: Literal["datetime"] 
+    value: datetime
+    
+    @field_validator('value', mode='before')
+    def set_utc__if_naive(cls, value):
+        if isinstance(value, datetime):
+            return ensure_utc(value)
+        else:
+            return value
+    
+class BoolAttribute(AttributeBase):
+    type: Literal["bool"] 
+    value: bool
+    
+class TextAttribute(AttributeBase):
+    type: Literal["text"] 
+    value: str
+    
+    
+    
+        
+class NumericValue(LabFREED_BaseModel):
+    magnitude: str
+    unit: str
+    
+    @model_validator(mode='after')
+    def _validate_value(self):
+        value = self.magnitude
+        if not_allowed_chars := set(re.sub(r'[0-9\.\-\+Ee]', '', value)):
+            self._add_validation_message(
+                source="Numeric Attribute",
+                level=ValidationMsgLevel.ERROR,  # noqa: F821
+                msg=f"Characters {_quote_texts(not_allowed_chars)} are not allowed in quantity segment. Must be a number.",
+                highlight_pattern = f'{value}',
+                highlight_sub=not_allowed_chars
+            )
+        if not re.fullmatch(r'-?\d+(\.\d+)?([Ee][\+-]?\d+)?', value):
+            self._add_validation_message(
+                source="Numeric Attribute",
+                level=ValidationMsgLevel.ERROR,
+                msg=f"{value} cannot be converted to number",
+                highlight_pattern = f'{value}'               
+            )
+        return self
+    
+    @model_validator(mode="after")
+    def _validate_units(self):
+        '''A sanity check on unit complying with UCUM. NOTE: It is not a complete validation
+        - I check for blankspaces and ^, which are often used for units, but are invalid.
+        - the general structure of a ucum unit is validated, but 1)parentheses are not matched 2) units are not validated 3)prefixes are not checked
+        '''
+        if ' ' in self.unit or '^' in self.unit:
+            self._add_validation_message(
+                    source="Numeric Attribute",
+                    level= ValidationMsgLevel.ERROR,
+                    msg=f"Unit {self.unit} is invalid. Must not contain blankspace  or '^'.",
+                    highlight_pattern = self.unit
+            )
+        elif not re.fullmatch(r"^(((?P<unit>[\w\[\]]+?)(?P<exponent>\-?\d+)?|(?P<annotation>)\{\w+?\})(?P<operator>[\./]?)?)+", self.unit):
+            self._add_validation_message(
+                    source="Numeric Attribute",
+                    level= ValidationMsgLevel.WARNING,
+                    msg=f"Unit {self.unit} is probably invalid. Ensure it complies with UCUM specifications.",
+                    highlight_pattern = self.unit
+            )
+        return self
+    
+    
+
+
+class NumericAttribute(AttributeBase):
+    type: Literal["numeric"] 
+    value: NumericValue
+    
+class ObjectAttribute(AttributeBase):
+    type: Literal["object"] 
+    value: dict[str, Any]
+           
+
+     
+     
+Attribute = Annotated[
+    Union[
+        ReferenceAttribute,
+        DateTimeAttribute,
+        BoolAttribute,
+        TextAttribute,
+        NumericAttribute,
+        ObjectAttribute
+    ],
+    Field(discriminator="type")
+]
+
+VALID_FOREVER = "forever"
+
+class AttributeGroup(LabFREED_BaseModel):
+    key: str
+    label: str = ""
+    attributes: list[Attribute]
+    
+    state_of: datetime
+    valid_until: datetime | Literal["forever"] | None = None
+    
+    @field_validator('valid_until', mode='before')
+    def set_utc_valid_until_if_naive(cls, value):
+        if isinstance(value, datetime):
+            return ensure_utc(value)
+        else:
+            return value
+
+
+class AttributesOfPACID(LabFREED_BaseModel):
+    pac_url: str
+    attribute_groups: list[AttributeGroup]
+    
+    
+
+class AttributeResponsePayload(LabFREED_BaseModel):
+    schema_version: str = Field(default='1.0')
+    language:str 
+    pac_attributes: list[AttributesOfPACID]      
+    
+    def to_json(self):
+        return self.model_dump_json(exclude_none=True)
+    
+    
+
+
+
+
+
+
+
+

labfreed-0.3.0a0/labfreed/pac_attributes/api_data_models/server_capabilities_response.py

@@ -0,0 +1,7 @@
+from pydantic import BaseModel
+
+
+class ServerCapabilities(BaseModel):
+    supported_languages: list[str]
+    default_language: str
+    available_attribute_groups: list[str]

labfreed-0.3.0a0/labfreed/pac_attributes/client/__init__.py

@@ -0,0 +1 @@
+import labfreed.utilities.translations

labfreed-0.3.0a0/labfreed/pac_attributes/client/attribute_cache.py

@@ -0,0 +1,78 @@
+
+
+from datetime import datetime
+from typing import Literal, Protocol
+
+
+from labfreed.pac_attributes.api_data_models.response import AttributeGroup
+from labfreed.pac_id.pac_id import PAC_ID
+
+
+
+class CacheableAttributeGroup(AttributeGroup):
+    origin:str
+    language:str
+    valid_until: Literal['forever'] | datetime | None = None
+    
+    # @model_validator(mode='after')
+    # def set_valid_until(self) -> 'CacheableAttributeGroup':
+    #     vals = [a.valid_until for a in self.attributes]
+    #     if all(e == 'forever' for e in vals):
+    #         self.valid_until = 'forever'
+    #     elif any(e is None for e in vals):
+    #         self.valid_until = None
+    #     else:
+    #         self.valid_until = min(v for v in vals if isinstance(v, datetime))
+    #     return self
+    
+    
+    @property
+    def still_valid(self):
+        if self.valid_until is None:
+            return False
+        if self.valid_until == 'forever':
+            return True
+        
+        return self.valid_until > datetime.now()
+
+
+
+
+class AttributeCache(Protocol):
+    def get_all(self, service_url:str, pac:PAC_ID) -> list[CacheableAttributeGroup]:
+        pass
+    
+    def get_attribute_groups(self, service_url:str, pac:PAC_ID, attribute_groups:list[str]):
+        pass
+        
+    def update(self, service_url:str, pac:PAC_ID, attribute_groups:list[CacheableAttributeGroup]):
+        pass
+    
+
+            
+class MemoryAttributeCache(AttributeCache):
+    '''simple in-memory implementation of AttributeCache'''
+    def __init__(self):
+        self._store = dict()
+    
+    def get_all(self, service_url:str, pac:PAC_ID|str) -> list[CacheableAttributeGroup]:
+        if isinstance(pac, str):
+            pac = PAC_ID.from_url(pac)
+        k = self._generate_dict_key(service_url=service_url, pac=pac)
+        
+        ags = [CacheableAttributeGroup.model_validate(e) for e in self._store.get(k, [])]
+        return ags
+    
+    def get_attribute_groups(self, service_url:str, pac:PAC_ID, attribute_groups:list[str]):
+        all_ags = self.get_all(service_url=service_url, pac=pac)
+        selected_ags = [ag for ag in all_ags if ag.key in attribute_groups]
+        return selected_ags
+        
+    def update(self, service_url:str, pac:PAC_ID, attribute_groups: list[CacheableAttributeGroup] ):
+        k = self._generate_dict_key(service_url=service_url, pac=pac)
+        self._store.update({k: [e.model_dump() for e in attribute_groups]})
+    
+    @staticmethod
+    def _generate_dict_key(service_url:str, pac:PAC_ID):
+        key = service_url +";"+ pac.to_url(include_extensions=False) 
+        return key