labfreed 1.0.0a17__tar.gz → 1.0.0a18__tar.gz

{labfreed-1.0.0a17 → labfreed-1.0.0a18}/PKG-INFO

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

{labfreed-1.0.0a17 → labfreed-1.0.0a18}/labfreed/__init__.py

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

{labfreed-1.0.0a17 → labfreed-1.0.0a18}/labfreed/labfreed_extended/app/app_infrastructure.py

@@ -44,7 +44,7 @@ class Labfreed_App_Infrastructure():
         self._resolver._resolver_configs.discard(resolver_config)
         
         
-    def process_pac(self, pac_url, markup=None):
+    def process_pac(self, pac_url) -> PacInfo:
         if not isinstance(pac_url, PAC_ID):
             pac = PAC_ID.from_url(pac_url)
         else:

{labfreed-1.0.0a17 → labfreed-1.0.0a18}/labfreed/pac_attributes/api_data_models/response.py

@@ -38,7 +38,7 @@ class DateTimeAttribute(AttributeBase):
     type: Literal["datetime"] 
     value: datetime
     
-    @field_validator('value', mode='before')
+    @field_validator('value', mode='after')
     def set_utc__if_naive(cls, value):
         if isinstance(value, datetime):
             return ensure_utc(value)
@@ -49,14 +49,15 @@ class DateTimeListAttribute(AttributeBase):
     type: Literal["datetime-list"] 
     value: list[datetime]
     
-    @field_validator('value', mode='before')
+    @field_validator('value', mode='after')
     def set_utc__if_naive(cls, value):
         value_out = []
         for v in value:
             if isinstance(v, datetime):
                 value_out.append(ensure_utc(v))
             else:
-                return ValueError(f'{v} is of type {type(v)}. It must be datetime')
+                raise ValueError(f'{v} is of type {type(v)}. It must be datetime')
+        return value_out
     
     
     

{labfreed-1.0.0a17 → labfreed-1.0.0a18}/labfreed/pac_attributes/client/client.py

@@ -51,7 +51,7 @@ def http_attribute_request_default_callback_factory(session: requests.Session =
 
     def callback(url: str, attribute_request_body: str) -> tuple[int, str]:
         try:
-            resp = session.post(url, data=attribute_request_body, headers={'Content-Type': 'application/json'}, timeout=10)
+            resp = session.post(url, data=attribute_request_body, headers={'Content-Type': 'application/json; ; charset=utf-8'}, timeout=10)
             return resp.status_code, resp.text
         except requests.exceptions.RequestException as e:
             return 500, str(e)

{labfreed-1.0.0a17 → labfreed-1.0.0a18}/labfreed/pac_attributes/pythonic/attribute_server_factory.py

@@ -86,7 +86,7 @@ class AttributeFlaskApp(Flask):
             except Exception as e:
                 print(e)
                 return "The request was valid, but the server encountered an error", 500
-            return (response_body, 200, {"Content-Type": "application/json"})
+            return (response_body, 200, {"Content-Type": "application/json; charset=utf-8"})
 
         @bp.route("/", methods=["GET"], strict_slashes=False)
         def capabilities():

{labfreed-1.0.0a17 → labfreed-1.0.0a18}/labfreed/pac_attributes/pythonic/py_attributes.py

@@ -6,7 +6,7 @@ import warnings
 from pydantic import RootModel, field_validator
 
 from labfreed.labfreed_infrastructure import LabFREED_BaseModel
-from labfreed.pac_attributes.api_data_models.response import AttributeBase, AttributeGroup, BoolAttribute, BoolListAttribute, DateTimeAttribute, DateTimeListAttribute,  NumericAttribute, NumericListAttribute, NumericValue, ObjectAttribute, ReferenceAttribute, ReferenceListAttribute, ResourceAttribute, ResourceListAttribute, TextAttribute, TextListAttribute
+from labfreed.pac_attributes.api_data_models.response import AttributeBase, AttributeGroup, BoolAttribute, BoolListAttribute, DateTimeAttribute, DateTimeListAttribute,  NumericAttribute, NumericListAttribute, NumericValue, ObjectAttribute,ObjectListAttribute, ReferenceAttribute, ReferenceListAttribute, ResourceAttribute, ResourceListAttribute, TextAttribute, TextListAttribute
 from labfreed.pac_attributes.client.attribute_cache import CacheableAttributeGroup
 from labfreed.pac_id.pac_id import PAC_ID
 from labfreed.trex.pythonic.quantity import Quantity
@@ -141,7 +141,10 @@ class pyAttributes(RootModel[list[pyAttribute]]):
         else: #this covers the last resort case of arbitrary objects. Must be json serializable.
             try :
                 values = [json.loads(json.dumps(v)) for v in value_list]
-                return ObjectAttribute(value=values, **common_args)
+                if len(values) == 1:
+                    return ObjectAttribute(value=values[0], **common_args)
+                else:
+                    return ObjectListAttribute(value=values, **common_args)
             except TypeError as e:  # noqa: F841
                 raise ValueError(f'Invalid Type: {type(first_value)} cannot be converted to attribute. You may want to use ObjectAttribute, but would have to implement the conversion from your python type yourself.')
         
@@ -162,16 +165,16 @@ class pyAttributes(RootModel[list[pyAttribute]]):
                 case NumericAttribute() | NumericListAttribute():                                       
                     values = [ Quantity.from_str_value(value=v.numerical_value, unit=v.unit) for v in value_list]
 
-                case BoolAttribute() | BoolAttribute():
+                case BoolAttribute() | BoolListAttribute():
                     values = value_list
                     
                 case TextAttribute() | TextListAttribute():
                     values = value_list
                     
-                case DateTimeAttribute() | DateTimeAttribute():                    
+                case DateTimeAttribute() | DateTimeListAttribute():                    
                     values = value_list
                 
-                case ObjectAttribute() | ObjectAttribute():
+                case ObjectAttribute() | ObjectListAttribute():
                     values = value_list