labfreed 0.2.7__tar.gz → 0.2.8a0__tar.gz

{labfreed-0.2.7 → labfreed-0.2.8a0}/PKG-INFO

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

{labfreed-0.2.7 → labfreed-0.2.8a0}/labfreed/__init__.py

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

{labfreed-0.2.7 → labfreed-0.2.8a0}/labfreed/pac_id_resolver/services.py

@@ -2,10 +2,11 @@
 from enum import auto, Enum
 
 from pydantic import Field
-from requests import RequestException, get, head
+import requests
 
 from concurrent.futures import ThreadPoolExecutor, as_completed
 
+import requests
 from rich import print
 from rich.table import Table
 
@@ -24,15 +25,17 @@ class Service(LabFREED_BaseModel):
     url:str
     status:ServiceStatus =ServiceStatus.UNKNOWN
     
-    def check_service_status(self):
+    def check_service_status(self, session:requests.Session = None):
         '''Checks the availability of the service.'''
+        s = session or requests
+                
         try:
-            r = head(self.url, timeout=2)
+            r = s.head(self.url, timeout=2)
             if r.status_code < 400:
                 self.status = ServiceStatus.ACTIVE
             else: 
                 self.status = ServiceStatus.INACTIVE
-        except RequestException as e:
+        except requests.RequestException as e:
             print(f"Request failed: {e}")
             self.status = ServiceStatus.INACTIVE
              
@@ -42,12 +45,12 @@ class ServiceGroup(LabFREED_BaseModel):
     origin: str = ""
     services: list[Service] = Field(default_factory=list)
     
-    def update_states(self):
+    def update_states(self, session:requests.Session = None):
         '''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]
+            futures = [executor.submit(s.check_service_status, session=session) for s in self.services]
             for _ in as_completed(futures):
                 pass  # just wait for all to finish
             
@@ -74,7 +77,7 @@ class ServiceGroup(LabFREED_BaseModel):
         
 def _has_internet_connection():
     try:
-        get("https://1.1.1.1", timeout=3)
+        requests.get("https://1.1.1.1", timeout=3)
         return True
-    except RequestException:
+    except requests.RequestException:
         return False