Replace pyproject toml version fetch with util

Author: tuvshuud

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "telq"
-version = "1.3.0"
+version = "1.3.1"
 description = "Python SDK for TelQ Telecom API"
 authors = ["Tuvshinbayar Davaa <[email protected]>"]
 

telq/authentication/__init__.py

@@ -4,6 +4,7 @@
 import toml
 import requests
 import telq.endpoints as endpoints
+from telq.util.version import SDK_VERSION
 
 
 @dataclass
@@ -42,26 +43,12 @@ def __post_init__(self) -> None:
         self.headers = {
             "accept": "application/json",
             "Content-Type": "application/json",
-            "User-Agent": f"python-sdk/{self.__get_sdk_version__()}"
+            "User-Agent": f"python-sdk/{SDK_VERSION}"
         }
         self.data = {"appId": self.api_id, "appKey": self.api_key, "baseUrl": self.base_url}
         self._validate_api_version()
         self._authenticate_user()
 
-    def __get_sdk_version__(self):
-        pyproject_toml_path = os.path.abspath(
-            os.path.join(os.path.dirname(__file__), "..", "..", "pyproject.toml")
-        )
-        with open(pyproject_toml_path, "r") as file:
-            content = file.read()
-
-        # Parse the content using the toml library
-        data = toml.loads(content)
-
-        # Extract the version (assuming it's under [tool.poetry])
-        version = data["tool"]["poetry"]["version"]
-        return version
-
     def _validate_api_version(self) -> None:
         _deprecated_versions = ["v1.0", "v1.1", "v1.2", "v1.3", "v1.4"]
         _currently_supported_versions = ["v1.5", "v2.1", "v3"]

telq/util/rest.py

@@ -7,31 +7,18 @@
 from requests.exceptions import JSONDecodeError
 
 from telq.authentication import Authentication
+from telq.util.version import SDK_VERSION
 
 class TelQRest(ABC):
     def __init__(self, authentcation: Optional[Authentication] = None):
         self._authentication = authentcation
-        self.sdk_version = self.__get_sdk_version__()
 
-    def __get_sdk_version__(self):
-        pyproject_toml_path = os.path.abspath(
-            os.path.join(os.path.dirname(__file__), "..", "..", "pyproject.toml")
-        )
-        with open(pyproject_toml_path, "r") as file:
-            content = file.read()
-
-        # Parse the content using the toml library
-        data = toml.loads(content)
-
-        # Extract the version (assuming it's under [tool.poetry])
-        version = data["tool"]["poetry"]["version"]
-        return version
 
     def request(self, url: str, method: str, data: Optional[dict] = None, extra_headers: Optional[dict] = None) -> dict:
         headers = {
             "accept": "*/*",
             "Content-Type": "application/json",
-            "User-Agent": f"python-sdk/{self.sdk_version}"
+            "User-Agent": f"python-sdk/{SDK_VERSION}"
         }
         if self._authentication:
             headers["Authorization"] = self._authentication._bearer_token

telq/util/version.py

@@ -0,0 +1 @@
+SDK_VERSION="1.3.1"