labfreed 0.2.6a4__tar.gz → 0.2.6a6__tar.gz

{labfreed-0.2.6a4 → labfreed-0.2.6a6}/PKG-INFO

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

{labfreed-0.2.6a4 → labfreed-0.2.6a6}/labfreed/__init__.py

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

{labfreed-0.2.6a4 → labfreed-0.2.6a6}/labfreed/pac_id_resolver/cit_v1.py

@@ -153,6 +153,9 @@ class CIT_v1(LabFREED_BaseModel):
             raise ValueError('CIT v1 does only handle PAC-IDs. PAC-CAT it does not know what to do')
         cit_evaluated = ServiceGroup(origin=self.origin)   
         for e in self.entries:
+            if e.errors():
+                continue #make this stable against errors in the cit
+            
             conditions = e.applicable_if.split(';')
             conditions_evaluated = list()
             for c in conditions:

{labfreed-0.2.6a4 → labfreed-0.2.6a6}/labfreed/pac_id_resolver/cit_v2.py

@@ -130,7 +130,12 @@ class CIT_v2(LabFREED_BaseModel):
     
     @classmethod
     def from_yaml(cls, yml:str) -> Self:
-        return cls.model_validate(yml)
+        try:
+            d = yaml.safe_load(yml)
+        except yaml.YAMLError as e:
+            # not a valid yaml
+            raise ValueError("This is not a valid yaml") from e
+        return cls.model_validate(d)
     
     def __str__(self):
         yml = yaml.dump(self.model_dump()                        )
@@ -145,6 +150,8 @@ class CIT_v2(LabFREED_BaseModel):
                 continue
 
             for e in block.entries:
+                if e.errors():
+                    continue #make this stable against errors in the cit
                 url = self._eval_url_template(pac_id_json, e.template_url)
                 cit_evaluated.services.append(Service(  
                                                         service_name=e.service_name,

{labfreed-0.2.6a4 → labfreed-0.2.6a6}/labfreed/pac_id_resolver/resolver.py

@@ -1,4 +1,6 @@
+from functools import lru_cache
 import logging
+import traceback
 from typing import Self
 import yaml
 from requests import get
@@ -24,11 +26,11 @@ def load_cit(path):
     
 def cit_from_str(s:str, origin:str='') -> CIT_v1|CIT_v2:
     try:
-        cit_yml= yaml.safe_load(s)
-        cit2 = CIT_v2.from_yaml(cit_yml)
+        cit2 = CIT_v2.from_yaml(s)
         cit_version = 'v2'
     except Exception:
         cit2 = None
+        traceback.print_exc()
     try:
         cit1 = CIT_v1.from_csv(s, origin)
         cit_version = 'v1'
@@ -38,6 +40,7 @@ def cit_from_str(s:str, origin:str='') -> CIT_v1|CIT_v2:
     cit = cit2 or cit1 or None
     return cit
 
+@lru_cache
 def _get_issuer_cit(issuer:str):
     '''Gets the issuer's cit.'''
     url = 'HTTPS://PAC.' + issuer + '/coupling-information-table'
@@ -64,15 +67,16 @@ class PAC_ID_Resolver():
         self._cits = cits
             
         
-    def resolve(self, pac_url:PAC_ID|str, check_service_status=True) -> list[ServiceGroup]:
+    def resolve(self, pac_url:PAC_ID|str, check_service_status=True, use_issuer_cit=True) -> list[ServiceGroup]:
         '''Resolve a PAC-ID'''
         if isinstance(pac_url, str):
             pac_id = PAC_CAT.from_url(pac_url)
             pac_id_catless = PAC_ID.from_url(pac_url, try_pac_cat=False)
                 
         cits = self._cits.copy()
-        if issuer_cit := _get_issuer_cit(pac_id.issuer):
-            cits.append(issuer_cit)
+        if use_issuer_cit:
+            if issuer_cit := _get_issuer_cit(pac_id.issuer):
+                cits.append(issuer_cit)
          
         matches = []
         for cit in cits: