labfreed 0.2.5a9__tar.gz → 0.2.5a11__tar.gz

{labfreed-0.2.5a9 → labfreed-0.2.5a11}/PKG-INFO

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

{labfreed-0.2.5a9 → labfreed-0.2.5a11}/labfreed/__init__.py

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

{labfreed-0.2.5a9 → labfreed-0.2.5a11}/labfreed/pac_cat/__init__.py

@@ -2,7 +2,7 @@ from .pac_cat import PAC_CAT
 from .category_base import Category
 from .predefined_categories import (
     Material_Device, Material_Substance, Material_Consumable, Material_Misc, Data_Method, Data_Result, Data_Progress, 
-    Data_Calibration, Data_Abstract, category_key_to_class_map
+    Data_Calibration, Data_Abstract, category_key_to_class_map  # noqa: F401
     )
 
 __all__ = [

{labfreed-0.2.5a9 → labfreed-0.2.5a11}/labfreed/trex/python_convenience/data_table.py

@@ -51,6 +51,7 @@ class DataTable(BaseModel):
             if not len(item) == len(self._row_template):
                 raise ValueError('row is not of same length as the row template.')
             self.data.append(item) 
+       
             
     def get_column(self, col:str|int) -> list:
         if isinstance(col, str):
@@ -60,9 +61,16 @@ class DataTable(BaseModel):
         col_data = [row[col_index] for row in self.data]
         return col_data
     
+    
     def get_row(self, row_index:int) -> list:
         return self.data[row_index]
     
+    
+    def get_row_as_dict(self, row_index:int) -> list:
+        d = {k:v for k, v in zip(self.col_names, self.data[row_index])}
+        return d
+    
+    
     def get_cell(self, row_index:int, col:str|int):
         if isinstance(col, str):
             col_index = self.col_names.index()

{labfreed-0.2.5a9 → labfreed-0.2.5a11}/labfreed/trex/python_convenience/pyTREX.py

@@ -2,6 +2,7 @@
 from datetime import date, datetime, time
 import logging
 import re
+from typing import Self
 
 from pydantic import RootModel
 from labfreed.well_known_keys.unece.unece_units import unece_unit
@@ -24,7 +25,7 @@ class pyTREX(RootModel[dict[str, Quantity | datetime | time | date | bool | str
 
     
     @classmethod
-    def from_trex(cls, trex:TREX) -> pyTREX:
+    def from_trex(cls, trex:TREX) -> Self:
         '''Creates a pyTREX from a TREX'''
         return {seg.key: _trex_segment_to_python_type(seg) for seg in trex.segments}
              

{labfreed-0.2.5a9 → labfreed-0.2.5a11}/labfreed/trex/trex_base_models.py

@@ -1,5 +1,4 @@
-from datetime import date, datetime, time
-import logging
+from datetime import datetime, time
 import re
 
 

{labfreed-0.2.5a9 → labfreed-0.2.5a11}/labfreed/trex/value_segments.py

@@ -1,9 +1,7 @@
 from abc import ABC
-import logging
 import re
 from typing import Literal
 from pydantic import Field, model_validator
-from labfreed.utilities.base36 import base36
 from labfreed.well_known_keys.unece.unece_units import unece_unit_codes
 from labfreed.labfreed_infrastructure import ValidationMsgLevel
 from labfreed.trex.trex_base_models import AlphanumericValue, BinaryValue, BoolValue, DateValue, ErrorValue, NumericValue, TREX_Segment, TextValue, Value