labfreed 0.0.14__tar.gz → 0.0.16__tar.gz

labfreed-0.0.16/PKG-INFO

@@ -0,0 +1,194 @@
+Metadata-Version: 2.4
+Name: labfreed
+Version: 0.0.16
+Summary: Python implementation of LabFREED building blocks
+Author-email: Reto Thürer <thuerer.r@buchi.com>
+Description-Content-Type: text/markdown
+License-Expression: MIT
+License-File: LICENSE
+
+# LabFREED for Python
+
+[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE) [![PyPI](https://img.shields.io/pypi/v/labfreed.svg)](https://pypi.org/project/labfreed/) ![Python Version](https://img.shields.io/pypi/pyversions/labfreed)
+
+<!--
+[![Tests](https://github.com/retothuerer/LabFREED/actions/workflows/ci.yml/badge.svg)](https://github.com/retothuerer/LabFREED/actions/workflows/ci.yml)
+-->
+
+This is a Python implementation of [LabFREED](www.labfreed.wega-it.com) building blocks.
+
+## Supported Building Blocks
+- PAC-ID
+- PAC-CAT
+- TREX
+- Display Extension
+
+## Installation
+You can install LabFREED from [PyPI](https://pypi.org/project/labfreed/) using pip:
+
+```bash
+pip install labfreed
+```
+
+
+## Usage Examples
+> ⚠️ **Note:** These examples are building on each other. Imports and parsing are not repeated in each example.
+<!-- BEGIN EXAMPLES -->
+### Parse a simple PAC-ID
+
+```python
+from labfreed.parse_pac import PAC_Parser
+
+# Parse the PAC-ID
+pac_str = 'HTTPS://PAC.METTORIUS.COM/-MD/bal500/@1234'
+pac_id = PAC_Parser().parse(pac_str).pac_id
+
+# Check validity of this PAC-ID
+pac_id = PAC_Parser().parse(pac_str).pac_id
+is_valid = pac_id.is_valid()
+print('PAC-ID is valid: {is_valid}')
+```
+```text
+>> PAC-ID is valid: {is_valid}
+```
+### Show recommendations:
+Note that the PAC-ID -- while valid -- uses characters which are not recommended (results in larger QR code).
+There is a nice function to highlight problems
+
+```python
+pac_id.print_validation_messages()
+```
+```text
+>> =======================================
+>> Validation Results
+>> ---------------------------------------
+>> 
+>>  Recommendation  in      id segment value bal500
+>> HTTPS://PAC.METTORIUS.COM/-MD/bal500/@1234
+>> Characters a b l should not be used.
+>> 
+>>  Recommendation  in      id segment value @1234
+>> HTTPS://PAC.METTORIUS.COM/-MD/bal500/@1234
+>> Characters @ should not be used.
+>> 
+>>  Warning  in     Category -MD
+>> HTTPS://PAC.METTORIUS.COM/-MD/bal500/@1234
+>> Category key -MD is not a well known key. It is recommended to use well known keys only
+```
+### PAC-CAT
+
+```python
+from labfreed.PAC_CAT.data_model import PAC_CAT
+pac_str = 'HTTPS://PAC.METTORIUS.COM/-DR/XQ908756/-MD/bal500/@1234'
+pac_id = PAC_Parser().parse(pac_str).pac_id
+if isinstance(pac_id, PAC_CAT):
+    pac_id.print_categories()
+```
+```text
+>> Main Category
+>> ----------
+>> key 	 (): 	 -DR
+>> id 	 (21): 	 XQ908756
+>> Category
+>> ------ 
+>> key 	 (): 	 -MD
+>> model_number 	 (240): 	 bal500
+>> serial_number 	 (21): 	 @1234
+```
+### Parse a PAC-ID with extensions
+PAC-ID can have extensions. Here we parse a PAC-ID with attached display names and summary.
+
+```python
+pac_str = 'HTTPS://PAC.METTORIUS.COM/-MD/BAL500/1234*N$N/WM633OV3E5DGJW2BEG0PDM1EA7*SUM$TREX/WEIGHT$GRM:67.89'
+pac_id = PAC_Parser().parse(pac_str)
+
+# Display Name
+display_names = pac_id.get_extension('N') # display name has name 'N'
+print(display_names)
+```
+```text
+>> Display names: My Balance ❤️
+```
+```python
+# TREX
+trexes = pac_id.get_extension_of_type('TREX')
+trex = trexes[0] # there could be multiple trexes. In this example there is only one, though
+v = trex.get_segment('WEIGHT').to_python_type() 
+print(f'WEIGHT = {v}')
+```
+```text
+>> WEIGHT = 67.89 g
+```
+### Create a PAC-ID with Extensions
+
+#### Create PAC-ID
+
+```python
+from labfreed.PAC_ID.data_model import PACID, IDSegment
+from labfreed.utilities.well_known_keys import WellKnownKeys
+
+pac_id = PACID(issuer='METTORIUS:COM', identifier=[IDSegment(key=WellKnownKeys.SERIAL, value='1234')])
+pac_str = pac_id.serialize()
+print(pac_str)
+```
+```text
+>> HTTPS://PAC.METTORIUS:COM/21:1234
+```
+#### Create a TREX 
+TREX can conveniently be created from a python dictionary.
+Note that utility types for Quantity (number with unit) and table are needed
+
+```python
+from datetime import datetime
+from labfreed.TREX.data_model import TREX
+from labfreed.utilities.utility_types import Quantity, DataTable, Unit
+
+# Create TREX
+trex = TREX(name_='DEMO') 
+# Add value segments of different type
+trex.update(   
+                    {
+                        'STOP': datetime(year=2024,month=5,day=5,hour=13,minute=6),
+                        'TEMP': Quantity(value=10.15, unit=Unit(name='kelvin', symbol='K')),
+                        'OK':False,
+                        'COMMENT': 'FOO',
+                        'COMMENT2':'£'
+                    }
+)
+
+# Create a table
+table = DataTable(['DURATION', 'DATE', 'OK', 'COMMENT'])
+table.append([Quantity(value=1, unit=Unit(symbol='h', name='hour')), datetime.now(), True, 'FOO'])
+table.append([                                                 1.1,  datetime.now(), True, 'BAR'])
+table.append([                                                 1.3,  datetime.now(), False, 'BLUBB'])
+#add the table to the trex
+trex.update({'TABLE': table})
+
+# Validation also works the same way for TREX
+if trex.get_nested_validation_messages():
+    trex.print_validation_messages()
+
+# Side Note: The TREX can be turned back into a dict
+d = trex.dict()
+```
+#### Combine PAC-ID and TREX and serialize
+
+```python
+from labfreed.parse_pac import PACID_With_Extensions
+
+pac_with_trex = PACID_With_Extensions(pac_id=pac_id, extensions=[trex])
+pac_str = pac_with_trex.serialize()
+print(pac_str)
+```
+```text
+>> HTTPS://PAC.METTORIUS:COM/21:1234*DEMO$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:20250408T204437.738:T:FOO::1.1:20250408T204437.739:T:BAR::1.3:20250408T204437.739:F:BLUBB
+```
+<!-- END EXAMPLES -->
+
+
+
+## Change Log
+
+### v0.0.16
+- supports PAC-ID, PAC-CAT, TREX and DisplayName
+- ok-ish test coverage

labfreed-0.0.16/README.md

@@ -0,0 +1,185 @@
+# LabFREED for Python
+
+[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE) [![PyPI](https://img.shields.io/pypi/v/labfreed.svg)](https://pypi.org/project/labfreed/) ![Python Version](https://img.shields.io/pypi/pyversions/labfreed)
+
+<!--
+[![Tests](https://github.com/retothuerer/LabFREED/actions/workflows/ci.yml/badge.svg)](https://github.com/retothuerer/LabFREED/actions/workflows/ci.yml)
+-->
+
+This is a Python implementation of [LabFREED](www.labfreed.wega-it.com) building blocks.
+
+## Supported Building Blocks
+- PAC-ID
+- PAC-CAT
+- TREX
+- Display Extension
+
+## Installation
+You can install LabFREED from [PyPI](https://pypi.org/project/labfreed/) using pip:
+
+```bash
+pip install labfreed
+```
+
+
+## Usage Examples
+> ⚠️ **Note:** These examples are building on each other. Imports and parsing are not repeated in each example.
+<!-- BEGIN EXAMPLES -->
+### Parse a simple PAC-ID
+
+```python
+from labfreed.parse_pac import PAC_Parser
+
+# Parse the PAC-ID
+pac_str = 'HTTPS://PAC.METTORIUS.COM/-MD/bal500/@1234'
+pac_id = PAC_Parser().parse(pac_str).pac_id
+
+# Check validity of this PAC-ID
+pac_id = PAC_Parser().parse(pac_str).pac_id
+is_valid = pac_id.is_valid()
+print('PAC-ID is valid: {is_valid}')
+```
+```text
+>> PAC-ID is valid: {is_valid}
+```
+### Show recommendations:
+Note that the PAC-ID -- while valid -- uses characters which are not recommended (results in larger QR code).
+There is a nice function to highlight problems
+
+```python
+pac_id.print_validation_messages()
+```
+```text
+>> =======================================
+>> Validation Results
+>> ---------------------------------------
+>> 
+>>  Recommendation  in      id segment value bal500
+>> HTTPS://PAC.METTORIUS.COM/-MD/bal500/@1234
+>> Characters a b l should not be used.
+>> 
+>>  Recommendation  in      id segment value @1234
+>> HTTPS://PAC.METTORIUS.COM/-MD/bal500/@1234
+>> Characters @ should not be used.
+>> 
+>>  Warning  in     Category -MD
+>> HTTPS://PAC.METTORIUS.COM/-MD/bal500/@1234
+>> Category key -MD is not a well known key. It is recommended to use well known keys only
+```
+### PAC-CAT
+
+```python
+from labfreed.PAC_CAT.data_model import PAC_CAT
+pac_str = 'HTTPS://PAC.METTORIUS.COM/-DR/XQ908756/-MD/bal500/@1234'
+pac_id = PAC_Parser().parse(pac_str).pac_id
+if isinstance(pac_id, PAC_CAT):
+    pac_id.print_categories()
+```
+```text
+>> Main Category
+>> ----------
+>> key 	 (): 	 -DR
+>> id 	 (21): 	 XQ908756
+>> Category
+>> ------ 
+>> key 	 (): 	 -MD
+>> model_number 	 (240): 	 bal500
+>> serial_number 	 (21): 	 @1234
+```
+### Parse a PAC-ID with extensions
+PAC-ID can have extensions. Here we parse a PAC-ID with attached display names and summary.
+
+```python
+pac_str = 'HTTPS://PAC.METTORIUS.COM/-MD/BAL500/1234*N$N/WM633OV3E5DGJW2BEG0PDM1EA7*SUM$TREX/WEIGHT$GRM:67.89'
+pac_id = PAC_Parser().parse(pac_str)
+
+# Display Name
+display_names = pac_id.get_extension('N') # display name has name 'N'
+print(display_names)
+```
+```text
+>> Display names: My Balance ❤️
+```
+```python
+# TREX
+trexes = pac_id.get_extension_of_type('TREX')
+trex = trexes[0] # there could be multiple trexes. In this example there is only one, though
+v = trex.get_segment('WEIGHT').to_python_type() 
+print(f'WEIGHT = {v}')
+```
+```text
+>> WEIGHT = 67.89 g
+```
+### Create a PAC-ID with Extensions
+
+#### Create PAC-ID
+
+```python
+from labfreed.PAC_ID.data_model import PACID, IDSegment
+from labfreed.utilities.well_known_keys import WellKnownKeys
+
+pac_id = PACID(issuer='METTORIUS:COM', identifier=[IDSegment(key=WellKnownKeys.SERIAL, value='1234')])
+pac_str = pac_id.serialize()
+print(pac_str)
+```
+```text
+>> HTTPS://PAC.METTORIUS:COM/21:1234
+```
+#### Create a TREX 
+TREX can conveniently be created from a python dictionary.
+Note that utility types for Quantity (number with unit) and table are needed
+
+```python
+from datetime import datetime
+from labfreed.TREX.data_model import TREX
+from labfreed.utilities.utility_types import Quantity, DataTable, Unit
+
+# Create TREX
+trex = TREX(name_='DEMO') 
+# Add value segments of different type
+trex.update(   
+                    {
+                        'STOP': datetime(year=2024,month=5,day=5,hour=13,minute=6),
+                        'TEMP': Quantity(value=10.15, unit=Unit(name='kelvin', symbol='K')),
+                        'OK':False,
+                        'COMMENT': 'FOO',
+                        'COMMENT2':'£'
+                    }
+)
+
+# Create a table
+table = DataTable(['DURATION', 'DATE', 'OK', 'COMMENT'])
+table.append([Quantity(value=1, unit=Unit(symbol='h', name='hour')), datetime.now(), True, 'FOO'])
+table.append([                                                 1.1,  datetime.now(), True, 'BAR'])
+table.append([                                                 1.3,  datetime.now(), False, 'BLUBB'])
+#add the table to the trex
+trex.update({'TABLE': table})
+
+# Validation also works the same way for TREX
+if trex.get_nested_validation_messages():
+    trex.print_validation_messages()
+
+# Side Note: The TREX can be turned back into a dict
+d = trex.dict()
+```
+#### Combine PAC-ID and TREX and serialize
+
+```python
+from labfreed.parse_pac import PACID_With_Extensions
+
+pac_with_trex = PACID_With_Extensions(pac_id=pac_id, extensions=[trex])
+pac_str = pac_with_trex.serialize()
+print(pac_str)
+```
+```text
+>> HTTPS://PAC.METTORIUS:COM/21:1234*DEMO$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:20250408T204437.738:T:FOO::1.1:20250408T204437.739:T:BAR::1.3:20250408T204437.739:F:BLUBB
+```
+<!-- END EXAMPLES -->
+
+
+
+## Change Log
+
+### v0.0.16
+- supports PAC-ID, PAC-CAT, TREX and DisplayName
+- ok-ish test coverage

labfreed-0.0.16/examples.py

@@ -0,0 +1,118 @@
+''' 
+### Parse a simple PAC-ID 
+'''
+from labfreed.parse_pac import PAC_Parser
+
+# Parse the PAC-ID
+pac_str = 'HTTPS://PAC.METTORIUS.COM/-MD/bal500/@1234'
+pac_id = PAC_Parser().parse(pac_str).pac_id
+
+# Check validity of this PAC-ID
+pac_id = PAC_Parser().parse(pac_str).pac_id
+is_valid = pac_id.is_valid()
+print('PAC-ID is valid: {is_valid}')
+
+''' 
+### Show recommendations:
+Note that the PAC-ID -- while valid -- uses characters which are not recommended (results in larger QR code).
+There is a nice function to highlight problems
+'''
+pac_id.print_validation_messages()
+
+
+'''
+### PAC-CAT
+'''
+from labfreed.PAC_CAT.data_model import PAC_CAT
+pac_str = 'HTTPS://PAC.METTORIUS.COM/-DR/XQ908756/-MD/bal500/@1234'
+pac_id = PAC_Parser().parse(pac_str).pac_id
+if isinstance(pac_id, PAC_CAT):
+    pac_id.print_categories()
+
+
+
+
+
+''' 
+### Parse a PAC-ID with extensions
+PAC-ID can have extensions. Here we parse a PAC-ID with attached display names and summary.
+'''
+pac_str = 'HTTPS://PAC.METTORIUS.COM/-MD/BAL500/1234*N$N/WM633OV3E5DGJW2BEG0PDM1EA7*SUM$TREX/WEIGHT$GRM:67.89'
+pac_id = PAC_Parser().parse(pac_str)
+
+# Display Name
+display_names = pac_id.get_extension('N') # display name has name 'N'
+print(display_names)
+
+''''''
+# TREX
+trexes = pac_id.get_extension_of_type('TREX')
+trex = trexes[0] # there could be multiple trexes. In this example there is only one, though
+v = trex.get_segment('WEIGHT').to_python_type() 
+print(f'WEIGHT = {v}')
+
+
+
+''' 
+### Create a PAC-ID with Extensions
+
+#### Create PAC-ID
+'''
+from labfreed.PAC_ID.data_model import PACID, IDSegment
+from labfreed.utilities.well_known_keys import WellKnownKeys
+
+pac_id = PACID(issuer='METTORIUS:COM', identifier=[IDSegment(key=WellKnownKeys.SERIAL, value='1234')])
+pac_str = pac_id.serialize()
+print(pac_str)
+
+
+''' 
+#### Create a TREX 
+TREX can conveniently be created from a python dictionary.
+Note that utility types for Quantity (number with unit) and table are needed
+'''
+from datetime import datetime
+from labfreed.TREX.data_model import TREX
+from labfreed.utilities.utility_types import Quantity, DataTable, Unit
+
+# Create TREX
+trex = TREX(name_='DEMO') 
+# Add value segments of different type
+trex.update(   
+                    {
+                        'STOP': datetime(year=2024,month=5,day=5,hour=13,minute=6),
+                        'TEMP': Quantity(value=10.15, unit=Unit(name='kelvin', symbol='K')),
+                        'OK':False,
+                        'COMMENT': 'FOO',
+                        'COMMENT2':'£'
+                    }
+)
+
+# Create a table
+table = DataTable(['DURATION', 'DATE', 'OK', 'COMMENT'])
+table.append([Quantity(value=1, unit=Unit(symbol='h', name='hour')), datetime.now(), True, 'FOO'])
+table.append([                                                 1.1,  datetime.now(), True, 'BAR'])
+table.append([                                                 1.3,  datetime.now(), False, 'BLUBB'])
+#add the table to the trex
+trex.update({'TABLE': table})
+
+# Validation also works the same way for TREX
+if trex.get_nested_validation_messages():
+    trex.print_validation_messages()
+
+# Side Note: The TREX can be turned back into a dict
+d = trex.dict()
+
+''' 
+#### Combine PAC-ID and TREX and serialize
+'''
+from labfreed.parse_pac import PACID_With_Extensions
+
+pac_with_trex = PACID_With_Extensions(pac_id=pac_id, extensions=[trex])
+pac_str = pac_with_trex.serialize()
+print(pac_str)
+
+
+
+
+

{labfreed-0.0.14 → labfreed-0.0.16}/labfreed/PAC_CAT/data_model.py

@@ -138,6 +138,19 @@ class PAC_CAT(PACID):
                     )
             return self
         
+    def print_categories(self):
+        s = ''
+        for i, c in enumerate(self.categories):
+            if i == 0:
+                title = 'Main Category\n----------'
+            else:
+                title = 'Category\n------ '
+            
+            s += f'{title}\n'
+            s += str(c)
+            s += '\n'
+        print(s)
+        
         
     # @classmethod
     # def from_categories(cls, issuer:str, categories:list[Category]):
@@ -198,6 +211,11 @@ class Category(BaseModelWithValidationMessages):
         return self
     
     
+    def __str__(self):
+        s = '\n'.join( [f'{field_name} \t ({field_info.alias or ''}): \t {getattr(self, field_name)}' for  field_name, field_info in self.model_fields.items() if getattr(self, field_name)]) 
+        return s
+    
+    
     # def to_identifier_category(self, use_short_notation=False):
     #     '''Creates a Category with the correct segments. 
     #        Segments are in order of the Pydantic model fields. 
@@ -261,14 +279,14 @@ class Material_Device(Category):
             self.add_validation_message(
                     source=f"Category {self.key}",
                     type="Error",
-                    msg=f'Category key {self.key} is missing mandatory field Model NUmber',
+                    msg=f'Category key {self.key} is missing mandatory field Model Number',
                     highlight_pattern = f"{self.key}"
             )
         if not self.serial_number:
             self.add_validation_message(
                     source=f"Category {self.key}",
                     type="Error",
-                    msg=f'Category key {self.key} is missing mandatory field Serial NUmber',
+                    msg=f'Category key {self.key} is missing mandatory field Serial Number',
                     highlight_pattern = f"{self.key}"
             )
     
@@ -286,7 +304,7 @@ class Material_Substance(Category):
             self.add_validation_message(
                     source=f"Category {self.key}",
                     type="Error",
-                    msg=f'Category key {self.key} is missing mandatory field Product NUmber',
+                    msg=f'Category key {self.key} is missing mandatory field Product Number',
                     highlight_pattern = f"{self.key}"
             )
     
@@ -328,19 +346,19 @@ class Data_Abstract(Category, ABC):
                     highlight_pattern = f"{self.key}"
             )
 
-class Data_Result(Category):
+class Data_Result(Data_Abstract):
     key: str = Field(default='-DR', frozen=True)
     
-class Data_Method(Category):
+class Data_Method(Data_Abstract):
     key: str = Field(default='-DM', frozen=True)
     
-class Data_Calibration(Category):
+class Data_Calibration(Data_Abstract):
     key: str = Field(default='-DC', frozen=True)
     
-class Data_Progress(Category):
+class Data_Progress(Data_Abstract):
     key: str = Field(default='-DP', frozen=True)
     
-class Data_Static(Category):
+class Data_Static(Data_Abstract):
     key: str = Field(default='-DS', frozen=True)
     
     

{labfreed-0.0.14 → labfreed-0.0.16}/labfreed/TREX/data_model.py

@@ -654,6 +654,7 @@ class TREX(Extension, BaseModelWithValidationMessages):
                     data.append(r)
                     
                 self.segments.append(TREX_Table(key=k, column_headers=headers, data=data))
+        return self
                    
                 
     def dict(self):

{labfreed-0.0.14 → labfreed-0.0.16}/labfreed/__init__.py

@@ -2,4 +2,4 @@
 Python implementation of LabFREED building blocks
 '''
 
-__version__ = "0.0.14"
+__version__ = "0.0.16"

{labfreed-0.0.14 → labfreed-0.0.16}/labfreed/parse_pac.py

@@ -49,7 +49,7 @@ class PACID_With_Extensions(BaseModelWithValidationMessages):
     @classmethod
     def deserialize(cls, url, extension_interpreters ):
         parser = PAC_Parser(extension_interpreters)
-        return parser.parse_pac_with_extensions(url)
+        return parser.parse(url)
         
         
     
@@ -87,15 +87,15 @@ class PAC_Parser():
     def __init__(self, extension_interpreters:dict[str, Extension]=None):
         self.extension_interpreters = extension_interpreters or {'TREX': TREX, 'N': DisplayNames}
         
-    def parse_pac_with_extensions(self, pac_url:str) -> PACID_With_Extensions:
+    def parse(self, pac_url:str) -> PACID_With_Extensions:
         if '*' in pac_url:
             id_str, ext_str = pac_url.split('*', 1)
         else:
             id_str = pac_url
             ext_str = ""
             
-        pac_id = self.parse_pac_id(id_str)
-        extensions = self.parse_extensions(ext_str)
+        pac_id = self._parse_pac_id(id_str)
+        extensions = self._parse_extensions(ext_str)
         
         pac_with_extension = PACID_With_Extensions(pac_id=pac_id, extensions=extensions)
         if not pac_with_extension.is_valid():
@@ -104,7 +104,7 @@ class PAC_Parser():
         return pac_with_extension
             
             
-    def parse_pac_id(self,id_str:str) -> PACID:
+    def _parse_pac_id(self,id_str:str) -> PACID:
         m = re.match(f'(HTTPS://)?(PAC.)?(?P<issuer>.+?\..+?)/(?P<identifier>.*)', id_str)
         d = m.groupdict()
         
@@ -148,7 +148,7 @@ class PAC_Parser():
     
 
 
-    def parse_extensions(self, extensions_str:str|None) -> list[Extension]:    
+    def _parse_extensions(self, extensions_str:str|None) -> list[Extension]:    
         
         extensions = list()
         

{labfreed-0.0.14 → labfreed-0.0.16}/tests/test_(de)_serialization_incl_extension/test__parse.py

@@ -11,7 +11,7 @@ parser = PAC_Parser()
 
 # Extensions
 def test_valid_extensions():
-    pac = parser.parse_pac_with_extensions(valid_base + valid_standard_segments + "*name1$t1/data1*name2$t2/data2")
+    pac = parser.parse(valid_base + valid_standard_segments + "*name1$t1/data1*name2$t2/data2")
     extensions = pac.extensions
     ext: Extension = extensions[0]
     assert ext.name == 'name1'
@@ -45,7 +45,7 @@ def test_known_extension_types_are_parsed():
             'KNOWN_EXTENSION': ExtensionMockType,
     }  
     parser_with_known_extension = PAC_Parser(extension_interpreters)
-    pac = parser_with_known_extension.parse_pac_with_extensions(valid_base + valid_standard_segments + "*name1$KNOWN_EXTENSION/data1")
+    pac = parser_with_known_extension.parse(valid_base + valid_standard_segments + "*name1$KNOWN_EXTENSION/data1")
     extensions= pac.extensions
     ext: Extension = extensions[0]
     assert isinstance(ext, ExtensionMockType)
@@ -55,7 +55,7 @@ def test_known_extension_types_are_parsed():
     
     
 def test_imply_display_name_and_summary_extension():
-    pac = parser.parse_pac_with_extensions(valid_base + valid_standard_segments + "*data1*data2")
+    pac = parser.parse(valid_base + valid_standard_segments + "*data1*data2")
     extensions = pac.extensions
     ext: Extension = extensions[0]
     assert ext.name == 'N'
@@ -67,13 +67,13 @@ def test_imply_display_name_and_summary_extension():
     
 def test_stop_imply_extensions_after_explicit():
     with pytest.raises(Exception):
-        pac = parser.parse_pac_with_extensions(valid_base + valid_standard_segments + "*N$T/data1*data2")
+        pac = parser.parse(valid_base + valid_standard_segments + "*N$T/data1*data2")
         pac.extensions
         
 
 def test_extension_parsing():
     s = '*NAME$MYFORMAT/AUGDSJGTZFRDGJHDSFRTZGHJAAUTZSGADT*NAME$ANOTHERFORMAT/BLUBBER'
-    extensions = parser.parse_extensions(s)
+    extensions = parser._parse_extensions(s)
     ext: Extension = extensions[0]
     assert ext.name == 'NAME'
     assert ext.type == 'MYFORMAT'