python-jira-plus 2.0.6__py3-none-any.whl → 2.0.8__py3-none-any.whl

python_jira_plus/__init__.py

@@ -8,7 +8,7 @@ pagination, metadata validation, and more.
 from dotenv import load_dotenv
 
 from python_jira_plus.describe_allowed_value import describe_allowed_value
-from python_jira_plus.jira_plus import JiraPlus, ServerType
+from python_jira_plus.jira_plus import JiraPlus, ServerType, UrlScheme
 
 load_dotenv()
 
@@ -27,4 +27,4 @@ BASIC_FIELDS = [
     "resolution",
     "parent",
 ]
-__all__ = ["JiraPlus", "ServerType", "BASIC_FIELDS"]
+__all__ = ["JiraPlus", "ServerType", "UrlScheme", "BASIC_FIELDS"]

python_jira_plus/describe_allowed_value.py

@@ -11,17 +11,17 @@ def describe_allowed_value(value: Any, allowed_values: set = None) -> bool:
 
 @describe_allowed_value.register
 def _(value: int, allowed_values: list = None) -> bool:
-    return value == allowed_values
+    return value in allowed_values
 
 
 @describe_allowed_value.register
 def _(value: float, allowed_values: list = None) -> bool:
-    return value == allowed_values
+    return value in allowed_values
 
 
 @describe_allowed_value.register
 def _(value: str, allowed_values: list = None) -> bool:
-    return value == allowed_values
+    return value in allowed_values
 
 
 @describe_allowed_value.register

python_jira_plus/jira_plus.py

@@ -12,7 +12,7 @@ from custom_python_logger import get_logger
 from jira import JIRA, Issue, JIRAError
 from jira.client import ResultList
 from retrying import retry
-
+from packaging.version import Version
 from python_jira_plus.describe_allowed_value import describe_allowed_value
 
 
@@ -53,10 +53,12 @@ class JiraPlus:
 
         self.jira_client = self.create_connection()
         self.check_client_connection()
+        self.server_version = self.get_server_version()
+        self.use_legacy_api = self._resolve_use_legacy_api()
 
     @retry(stop_max_attempt_number=3, wait_fixed=180000)
-    def create_connection(self, timeout: int = 580) -> JIRA | None:
-        if self.server_type == ServerType.ON_PREMISE and not self.sso:  # pylint: disable=W0160:
+    def create_connection(self, timeout: int = 580) -> JIRA:
+        if self.server_type == ServerType.ON_PREMISE and not self.sso:
             jira_client = JIRA(
                 token_auth=self.jira_token, options={"server": self.server, "verify": self.verify_ssl}, timeout=timeout
             )
@@ -142,12 +144,16 @@ class JiraPlus:
         all_issues = []
         retries = 0
         page = None
-        while True:  # pylint: disable=W0149
+        while True:
             try:
+                next_token = None
+                if page is not None:
+                    next_token = page.get('nextPageToken') if json_result else page.nextPageToken
+
                 self.logger.debug(f"Fetching issues from startAt={len(all_issues)}")
                 page = self.jira_client.enhanced_search_issues(
                     jql_str=query,
-                    nextPageToken=page['nextPageToken'] if page else None,
+                    nextPageToken=next_token,
                     maxResults=max_results,
                     fields=specific_fields,
                     json_result=json_result,
@@ -156,7 +162,8 @@ class JiraPlus:
                     break
 
                 all_issues += page["issues"] if json_result else page
-                if page['isLast']:
+                is_last = page['isLast'] if json_result else page.isLast
+                if is_last:
                     break
                 retries = 0  # reset on success
             except JIRAError as err:
@@ -268,18 +275,16 @@ class JiraPlus:
     def get_server_version(self) -> tuple[int, ...]:
         return tuple(self.jira_client.server_info()["versionNumbers"])
 
-    def check_server_createmeta_compatibility(self) -> bool:
-        server_version = self.get_server_version()
-        if self.server_type == ServerType.ON_PREMISE and "".join(str(x) for x in server_version) > "9.0.0":
-            self.logger.warning(
-                f"JIRA server version {server_version} is below the minimum required version (9.0.0). "
-                "Some features may not work as expected."
-            )
-            return False
+    def _resolve_use_legacy_api(self) -> bool:
+        if self.server_type == ServerType.ON_PREMISE:
+            use_legacy = Version(".".join(str(x) for x in self.server_version)) < Version("9.0.0")
+            self.logger.debug(f"Using {'legacy createmeta' if use_legacy else 'project_issue_types'} API (ON_PREMISE {self.server_version})")
+            return use_legacy
+        self.logger.debug("Using legacy createmeta API (Cloud)")
         return True
 
     def get_project_fields_metadata(self, project_key: str, issue_type: str) -> dict:
-        if self.check_server_createmeta_compatibility():
+        if self.use_legacy_api:
             _, issue_meta = self._fetch_metadata(project_key=project_key, issue_type=issue_type)
             return issue_meta["fields"]
         _project_issue_types = self.jira_client.project_issue_types(project_key)
@@ -288,7 +293,7 @@ class JiraPlus:
         return {f.fieldId: f.raw for f in field_list}
 
     def validate_fields(  # pylint: disable=R1260
-        self, project_key: str, issue_type: str, fields: dict | None = None
+        self, project_key: str, issue_type: str, fields: dict
     ) -> None:
         fields_metadata = self.get_project_fields_metadata(project_key=project_key, issue_type=issue_type)
         for custom_field, value in fields.items():
@@ -367,7 +372,7 @@ class JiraPlus:
 
     def delete_issue(self, issue_key: str) -> bool:
         try:
-            issue = self.get_issue_by_key(key=issue_key)
+            issue = self.get_issue_by_key(key=issue_key, json_result=False)
             issue.delete()
             self.logger.info(f"Issue {issue_key} deleted successfully.")
             return True
@@ -452,10 +457,13 @@ class JiraPlus:
             return False
 
     def get_account_data(self, user_mail: str) -> list[dict]:
-        jira_rst_url = (
-            f"https://{self.jira_username}:{self.jira_token}@{self.base_url}/rest/api/{3}/user/search?query={user_mail}"
+        response = requests.get(
+            f"{self.server}/rest/api/3/user/search",
+            params={"query": user_mail},
+            auth=(self.jira_username, self.jira_token),
+            timeout=30,
         )
-        response = requests.get(jira_rst_url)
+        response.raise_for_status()
         return response.json()
 
     def get_account_id(self, user_mail: str) -> str:

{python_jira_plus-2.0.6.dist-info → python_jira_plus-2.0.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-jira-plus
-Version: 2.0.6
+Version: 2.0.8
 Summary: Enhanced Python client for JIRA with better error handling, pagination, and metadata validation.
 Author: Avi Zaguri
 License: MIT
@@ -17,14 +17,16 @@ Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: custom-python-logger>=2.0.10
-Requires-Dist: dotenv>=0.9.9
+Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: jira>=3.10.5
-Requires-Dist: pre-commit>=4.5.0
-Requires-Dist: pytest>=9.0.1
+Requires-Dist: packaging>=26.2
 Requires-Dist: requests>=2.32.5
 Requires-Dist: retrying>=1.4.2
-Requires-Dist: setuptools>=80.9.0
-Requires-Dist: wheel>=0.45.1
+Provides-Extra: dev
+Requires-Dist: pre-commit>=4.5.0; extra == "dev"
+Requires-Dist: pytest>=9.0.1; extra == "dev"
+Requires-Dist: setuptools>=80.9.0; extra == "dev"
+Requires-Dist: wheel>=0.45.1; extra == "dev"
 Dynamic: license-file
 
 ![PyPI version](https://img.shields.io/pypi/v/python-jira-plus)
@@ -59,7 +61,7 @@ pip install python-jira-plus
 ---
 
 ## Requirements
-- Python 3.9+
+- Python 3.12+
 - `jira` package
 - `retrying` package
 - `custom-python-logger` package

python_jira_plus-2.0.8.dist-info/RECORD

@@ -0,0 +1,8 @@
+python_jira_plus/__init__.py,sha256=BUKjGxQfkxWyZs-mKZs2bAgGnsYHQ4uOFjuB8MPmhfg,616
+python_jira_plus/describe_allowed_value.py,sha256=fWfq0DkvJ2zmNIUXPH5rO5OgcY69bUqBIfTPQyxBt5E,1287
+python_jira_plus/jira_plus.py,sha256=TNJkwFdDbkaVrsEaO3kBRGHi_GDFVhRcpoX6bAgyRTs,19568
+python_jira_plus-2.0.8.dist-info/licenses/LICENSE,sha256=cSikHY6SZFsPZSBizCDAJ0-Bjjzxt-JtX6TVbKxwimo,1067
+python_jira_plus-2.0.8.dist-info/METADATA,sha256=AdZUwcmuzp3qtoFVuaB1En8QQqjKxFz6_3U99X6G-o8,4285
+python_jira_plus-2.0.8.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+python_jira_plus-2.0.8.dist-info/top_level.txt,sha256=3DxBdmf_naggoqDHSvLstG_GX3bW2XXYYorBDybBUiA,17
+python_jira_plus-2.0.8.dist-info/RECORD,,

{python_jira_plus-2.0.6.dist-info → python_jira_plus-2.0.8.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (81.0.0)
+Generator: setuptools (82.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

python_jira_plus-2.0.6.dist-info/RECORD

@@ -1,8 +0,0 @@
-python_jira_plus/__init__.py,sha256=hi4PadXJu9vYDqslH0zxAm-UsU_zfVFHCImqbchHbDU,592
-python_jira_plus/describe_allowed_value.py,sha256=ZU3SN0d3Xy_4qPaVhkhqQYabt3Q_tN64J2yJ3mV0Abc,1287
-python_jira_plus/jira_plus.py,sha256=ZswRdySAqM0me5FEI9jSEdv3oxRklHYLGcAY2beQ9iI,19251
-python_jira_plus-2.0.6.dist-info/licenses/LICENSE,sha256=cSikHY6SZFsPZSBizCDAJ0-Bjjzxt-JtX6TVbKxwimo,1067
-python_jira_plus-2.0.6.dist-info/METADATA,sha256=3Fdm_jE2laIs9VjSBymL2DW8t84WX2CSX8HDci7Kt10,4162
-python_jira_plus-2.0.6.dist-info/WHEEL,sha256=YLJXdYXQ2FQ0Uqn2J-6iEIC-3iOey8lH3xCtvFLkd8Q,91
-python_jira_plus-2.0.6.dist-info/top_level.txt,sha256=3DxBdmf_naggoqDHSvLstG_GX3bW2XXYYorBDybBUiA,17
-python_jira_plus-2.0.6.dist-info/RECORD,,