labfreed 0.2.5a22__py3-none-any.whl → 0.2.6__py3-none-any.whl

labfreed/pac_id_resolver/resolver.py

@@ -1,85 +1,97 @@
-import logging
-from typing import Self
-import yaml
-from requests import get
-
-
-
-from labfreed.pac_cat.pac_cat import PAC_CAT
-from labfreed.pac_id.pac_id import PAC_ID
-from labfreed.pac_id_resolver.services import ServiceGroup
-from labfreed.pac_id_resolver.cit_v1 import CIT_v1
-from labfreed.pac_id_resolver.cit_v2 import CIT_v2
-
-
-
-''' Configure pdoc'''
-__all__ = ["PAC_ID_Resolver"]
-
-def load_cit(path):
-    with open(path, 'r') as f:
-        s = f.read()
-        return _cit_from_str(s)
-
-    
-def _cit_from_str(s:str, issuer:str='') -> CIT_v1|CIT_v2:
-    try:
-        cit_yml= yaml.safe_load(s)
-        cit2 = CIT_v2.from_yaml(cit_yml)
-    except Exception:
-        cit2 = None
-    
-    try:
-        cit1 = CIT_v1.from_csv(s, issuer)
-    except Exception:
-        cit1 = None
-    
-    cit = cit2 or cit1 or None
-    return cit
-
-def _get_issuer_cit(issuer:str):
-    '''Gets the issuer's cit.'''
-    url = 'HTTPS://PAC.' + issuer + '/coupling-information-table'
-    try:
-        r = get(url, timeout=2)
-        if r.status_code < 400:
-            cit_str = r.text
-        else: 
-            logging.error(f"Could not get CIT form {issuer}")
-            cit_str  = None
-    except Exception:
-        logging.error(f"Could not get CIT form {issuer}")
-        cit_str  = None
-    cit = _cit_from_str(cit_str, issuer=issuer)
-    return cit
-    
-
-
-class PAC_ID_Resolver():
-    def __init__(self, cits:list[CIT_v2|CIT_v1]=None) -> Self:
-        '''Initialize the resolver with coupling information tables'''
-        if not cits:
-            cits = []
-        self._cits = cits
-            
-        
-    def resolve(self, pac_id:PAC_ID|str, check_service_status=True) -> list[ServiceGroup]:
-        '''Resolve a PAC-ID'''
-        if isinstance(pac_id, str):
-            pac_id = PAC_CAT.from_url(pac_id)
-                
-        if issuer_cit := _get_issuer_cit(pac_id.issuer):
-            self._cits.append(issuer_cit)
-         
-        matches = [cit.evaluate_pac_id(pac_id) for cit in self._cits]
-        
-        if check_service_status:
-            for m in matches:
-                m.update_states()   
-        return matches
-            
-    
-    
-if __name__ == '__main__':
-    r = PAC_ID_Resolver()
-    r.resolve()
+from functools import lru_cache
+import logging
+import traceback
+from typing import Self
+import yaml
+from requests import get
+
+
+
+from labfreed.pac_cat.pac_cat import PAC_CAT
+from labfreed.pac_id.pac_id import PAC_ID
+from labfreed.pac_id_resolver.services import ServiceGroup
+from labfreed.pac_id_resolver.cit_v1 import CIT_v1
+from labfreed.pac_id_resolver.cit_v2 import CIT_v2
+
+
+
+''' Configure pdoc'''
+__all__ = ["PAC_ID_Resolver"]
+
+def load_cit(path):
+    with open(path, 'r') as f:
+        s = f.read()
+        return cit_from_str(s)
+
+    
+def cit_from_str(s:str, origin:str='') -> CIT_v1|CIT_v2:
+    try:
+        cit2 = CIT_v2.from_yaml(s)
+        cit_version = 'v2'
+    except Exception:
+        cit2 = None
+    try:
+        cit1 = CIT_v1.from_csv(s, origin)
+        cit_version = 'v1'
+    except Exception:
+        cit1 = None
+    
+    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'
+    try:
+        r = get(url, timeout=2)
+        if r.status_code < 400:
+            cit_str = r.text
+        else: 
+            logging.error(f"Could not get CIT form {issuer}")
+            cit_str  = None
+    except Exception:
+        logging.error(f"Could not get CIT form {issuer}")
+        cit_str  = None
+    cit = cit_from_str(cit_str, origin=issuer)
+    return cit
+    
+
+
+class PAC_ID_Resolver():
+    def __init__(self, cits:list[CIT_v2|CIT_v1]=None) -> Self:
+        '''Initialize the resolver with coupling information tables'''
+        if not cits:
+            cits = []
+        self._cits = cits
+            
+        
+    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 use_issuer_cit:
+            if issuer_cit := _get_issuer_cit(pac_id.issuer):
+                cits.append(issuer_cit)
+         
+        matches = []
+        for cit in cits:
+            if isinstance(cit, CIT_v1):
+                # cit v1 has no concept of categories and implied keys. It would treat these segments as value segment
+                matches.append(cit.evaluate_pac_id(pac_id_catless))
+            else:
+                matches.append(cit.evaluate_pac_id(pac_id))
+        
+        if check_service_status:
+            for m in matches:
+                m.update_states()   
+        return matches
+            
+    
+    
+if __name__ == '__main__':
+    r = PAC_ID_Resolver()
+    r.resolve()

labfreed/pac_id_resolver/services.py

@@ -1,80 +1,80 @@
-
-from enum import auto, Enum
-
-from pydantic import Field
-from requests import RequestException, get, head
-
-from concurrent.futures import ThreadPoolExecutor, as_completed
-
-from rich import print
-from rich.table import Table
-
-from labfreed.labfreed_infrastructure import LabFREED_BaseModel
-
-
-class ServiceStatus(Enum):
-    ACTIVE = auto()
-    INACTIVE = auto()
-    UNKNOWN = auto()
-    
-class Service(LabFREED_BaseModel):
-    service_name: str
-    application_intents:list[str]
-    service_type:str
-    url:str
-    status:ServiceStatus =ServiceStatus.UNKNOWN
-    
-    def check_service_status(self):
-        '''Checks the availability of the service.'''
-        try:
-            r = head(self.url, timeout=2)
-            if r.status_code < 400:
-                self.status = ServiceStatus.ACTIVE
-            else: 
-                self.status = ServiceStatus.INACTIVE
-        except RequestException as e:
-            print(f"Request failed: {e}")
-            self.status = ServiceStatus.INACTIVE
-             
-    
-class ServiceGroup(LabFREED_BaseModel):
-    """ Services with common origin. The result of resolving a PAC-ID against a CIT"""
-    origin: str = ""
-    services: list[Service] = Field(default_factory=list)
-    
-    def update_states(self):
-        '''Triggers each service to check if the url can be reached'''
-        if not _has_internet_connection():
-            raise ConnectionError("No Internet Connection")
-        with ThreadPoolExecutor(max_workers=10) as executor:
-            futures = [executor.submit(s.check_service_status) for s in self.services]
-            for _ in as_completed(futures):
-                pass  # just wait for all to finish
-            
-
-    
-    def __str__(self):
-        out = [f'CIT (origin {self.origin})']
-        for s in self.services:
-            out.append(f'{s.service_name}\t\t\t{s.url}')
-        return '\n'.join(out)
-    
-    def print(self):
-        table = Table(title=f"Services from origin '{self.origin}")
-
-        table.add_column("Service Name")
-        table.add_column("URL")
-        table.add_column('Reachable')
-        
-        for s in self.services:
-            table.add_row(s.service_name, s.url, s.status.name)
-
-        print(table)
-        
-        
-def _has_internet_connection():
-    try:
-        get("https://1.1.1.1", timeout=3)
-        return True
-    except RequestException:
+
+from enum import auto, Enum
+
+from pydantic import Field
+from requests import RequestException, get, head
+
+from concurrent.futures import ThreadPoolExecutor, as_completed
+
+from rich import print
+from rich.table import Table
+
+from labfreed.labfreed_infrastructure import LabFREED_BaseModel
+
+
+class ServiceStatus(Enum):
+    ACTIVE = auto()
+    INACTIVE = auto()
+    UNKNOWN = auto()
+    
+class Service(LabFREED_BaseModel):
+    service_name: str
+    application_intents:list[str]
+    service_type:str
+    url:str
+    status:ServiceStatus =ServiceStatus.UNKNOWN
+    
+    def check_service_status(self):
+        '''Checks the availability of the service.'''
+        try:
+            r = head(self.url, timeout=2)
+            if r.status_code < 400:
+                self.status = ServiceStatus.ACTIVE
+            else: 
+                self.status = ServiceStatus.INACTIVE
+        except RequestException as e:
+            print(f"Request failed: {e}")
+            self.status = ServiceStatus.INACTIVE
+             
+    
+class ServiceGroup(LabFREED_BaseModel):
+    """ Services with common origin. The result of resolving a PAC-ID against a CIT"""
+    origin: str = ""
+    services: list[Service] = Field(default_factory=list)
+    
+    def update_states(self):
+        '''Triggers each service to check if the url can be reached'''
+        if not _has_internet_connection():
+            raise ConnectionError("No Internet Connection")
+        with ThreadPoolExecutor(max_workers=10) as executor:
+            futures = [executor.submit(s.check_service_status) for s in self.services]
+            for _ in as_completed(futures):
+                pass  # just wait for all to finish
+            
+
+    
+    def __str__(self):
+        out = [f'CIT (origin {self.origin})']
+        for s in self.services:
+            out.append(f'{s.service_name}\t\t\t{s.url}')
+        return '\n'.join(out)
+    
+    def print(self):
+        table = Table(title=f"Services from origin '{self.origin}")
+
+        table.add_column("Service Name")
+        table.add_column("URL")
+        table.add_column('Reachable')
+        
+        for s in self.services:
+            table.add_row(s.service_name, s.url, s.status.name)
+
+        print(table)
+        
+        
+def _has_internet_connection():
+    try:
+        get("https://1.1.1.1", timeout=3)
+        return True
+    except RequestException:
         return False

labfreed/qr/__init__.py

@@ -1 +1 @@
-from .generate_qr import save_qr_with_markers  # noqa: F401
+from .generate_qr import save_qr_with_markers  # noqa: F401