zscams 2.0.11__tar.gz → 2.0.12__tar.gz

{zscams-2.0.11 → zscams-2.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zscams
-Version: 2.0.11
+Version: 2.0.12
 Summary: Async TLS tunnel client with SNI routing, auto-reconnect, and health checks
 Author: OCD - Cairo Software Team
 Maintainer: OCD - Cairo Software Team

{zscams-2.0.11 → zscams-2.0.12}/pyproject.toml

@@ -3,7 +3,7 @@ name = "zscams_agent"
 
 [tool.poetry]
 name = "zscams"
-version = "2.0.11"
+version = "2.0.12"
 description = "Async TLS tunnel client with SNI routing, auto-reconnect, and health checks"
 authors = ["OCD - Cairo Software Team"]
 maintainers = ["OCD - Cairo Software Team"]

{zscams-2.0.11 → zscams-2.0.12}/zscams/agent/src/support/configuration.py

@@ -3,8 +3,9 @@ Configuration loader module
 """
 
 import os
+import sys
 from pathlib import Path
-from typing import Optional, Type, TypedDict, cast
+from typing import Optional, Type, TypeVar, TypedDict, cast
 import yaml
 
 import zscams
@@ -13,6 +14,8 @@ from zscams.agent.src.support.yaml import YamlIndentedListsDumper, resolve_place
 ROOT_PATH = Path(zscams.__file__).resolve().parent.joinpath("agent")
 CONFIG_PATH = os.path.join(ROOT_PATH.absolute(), "config.yaml")
 
+GetReturnT = TypeVar("T")
+
 
 class MissingConfiguration(BaseException):
     """Error when the requisted key is not found"""
@@ -33,8 +36,14 @@ class Configuration:
         return cls.__instance
 
     def __load_config(self):
-        with open(CONFIG_PATH, "r", encoding="utf-8") as f:
-            self.__config = yaml.safe_load(f)
+        try:
+            with open(CONFIG_PATH, "r", encoding="utf-8") as f:
+                self.__config = yaml.safe_load(f)
+        except FileNotFoundError:
+            print(
+                f"Can't find configurations file. Make sure you have it by running `cp '{ROOT_PATH.joinpath('configuration/config.j2')}' '{CONFIG_PATH}'`",
+            )
+            sys.exit(1)
 
     def override_config(self, new_config: dict):
         """
@@ -56,13 +65,13 @@ class Configuration:
     def to_dict(self):
         return self.__config
 
-    def get[T](
+    def get(
         self,
         key: str,
-        default: Optional[T] = None,
+        default: Optional[GetReturnT] = None,
         must_resolve=False,
-        valtyp: Type[T] = str,
-    ) -> T:
+        valtyp: Type[GetReturnT] = str,
+    ) -> GetReturnT:
         """
         Returns the configuration value.
 
@@ -90,7 +99,7 @@ class Configuration:
                 val = None
                 break
 
-        return cast(T, val)
+        return cast(GetReturnT, val)
 
     def has(self, key: str):
         try: