python-jira-plus 1.0.15__tar.gz → 2.0.2__tar.gz

{python_jira_plus-1.0.15/python_jira_plus.egg-info → python_jira_plus-2.0.2}/PKG-INFO

@@ -1,32 +1,31 @@
 Metadata-Version: 2.4
 Name: python-jira-plus
-Version: 1.0.15
+Version: 2.0.2
 Summary: Enhanced Python client for JIRA with better error handling, pagination, and metadata validation.
-Home-page: https://github.com/aviz92/python-jira-plus
 Author: Avi Zaguri
-Author-email: 
+License: MIT
+Project-URL: Homepage, https://github.com/aviz92/python-jira-plus
 Project-URL: Repository, https://github.com/aviz92/python-jira-plus
+Project-URL: Issues, https://github.com/aviz92/python-jira-plus/issues
+Keywords: development,jira,atlassian,api,client,python
+Classifier: Development Status :: 4 - Beta
+Classifier: Intended Audience :: Developers
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Operating System :: OS Independent
+Classifier: Topic :: System :: Logging
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: setuptools
-Requires-Dist: wheel
-Requires-Dist: dotenv
-Requires-Dist: pre-commit
-Requires-Dist: custom-python-logger
-Requires-Dist: pytest
-Requires-Dist: requests
-Requires-Dist: retrying
-Requires-Dist: jira
-Dynamic: author
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
+Requires-Dist: custom-python-logger>=2.0.10
+Requires-Dist: dotenv>=0.9.9
+Requires-Dist: jira>=3.10.5
+Requires-Dist: pre-commit>=4.5.0
+Requires-Dist: pytest>=9.0.1
+Requires-Dist: requests>=2.32.5
+Requires-Dist: retrying>=1.4.2
+Requires-Dist: setuptools>=80.9.0
+Requires-Dist: wheel>=0.45.1
 Dynamic: license-file
-Dynamic: project-url
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
 
 # Python JIRA Plus
 An enhanced Python client for JIRA that extends the functionality of the official `jira` package, providing better error handling, pagination, metadata validation, and more.

python_jira_plus-2.0.2/pyproject.toml

@@ -0,0 +1,43 @@
+[build-system]
+requires = ["setuptools", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "python-jira-plus"
+version = "2.0.2"
+description = "Enhanced Python client for JIRA with better error handling, pagination, and metadata validation."
+readme = "README.md"
+requires-python = ">=3.11"
+license = { text = "MIT" }
+authors = [{ name = "Avi Zaguri" },]
+keywords = ["development", "jira", "atlassian", "api", "client", "python"]
+
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Intended Audience :: Developers",
+    "Programming Language :: Python :: 3.11",
+    "Operating System :: OS Independent",
+    "Topic :: System :: Logging",
+]
+
+dependencies = [
+    "custom-python-logger>=2.0.10",
+    "dotenv>=0.9.9",
+    "jira>=3.10.5",
+    "pre-commit>=4.5.0",
+    "pytest>=9.0.1",
+    "requests>=2.32.5",
+    "retrying>=1.4.2",
+    "setuptools>=80.9.0",
+    "wheel>=0.45.1",
+]
+
+[project.urls]
+Homepage = "https://github.com/aviz92/python-jira-plus"
+Repository = "https://github.com/aviz92/python-jira-plus"
+Issues = "https://github.com/aviz92/python-jira-plus/issues"
+
+[tool.setuptools.packages.find]
+where = ["."]
+include = ["python_jira_plus*"]
+namespaces = false

{python_jira_plus-1.0.15 → python_jira_plus-2.0.2}/python_jira_plus/jira_plus.py

@@ -119,7 +119,11 @@ class JiraPlus:
         jira_err_count: int = 3,
         json_result: bool = True,
     ) -> ResultList[Issue] | dict | None:
-        return self._paginate_query(
+        if self.server_type == ServerType.ON_PREMISE:
+            _paginate_query_func = self._paginate_query
+        else:
+            _paginate_query_func = self._paginate_query_new
+        return _paginate_query_func(
             query=query,
             max_results=max_results,
             specific_fields=specific_fields,
@@ -127,6 +131,43 @@ class JiraPlus:
             json_result=json_result,
         )
 
+    def _paginate_query_new(
+        self,
+        query: str,
+        max_results: int,
+        specific_fields: str | list[str],
+        jira_err_limit: int,
+        json_result: bool,
+    ) -> ResultList[Issue] | list:
+        all_issues = []
+        retries = 0
+        page = None
+        while True:  # pylint: disable=W0149
+            try:
+                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,
+                    maxResults=max_results,
+                    fields=specific_fields,
+                    json_result=json_result,
+                )
+                all_issues += page["issues"] if json_result else page
+                if page['isLast']:
+                    break
+                retries = 0  # reset on success
+            except JIRAError as err:
+                if err.status_code == 400:
+                    self.logger.error(f"Bad Request: {err.text}")
+                    raise JIRAError(f"Bad Request: {err.text}") from err
+                retries += 1
+                self.logger.warning(f"Retry {retries}/{jira_err_limit} after JIRAError: {err}")
+                if retries >= jira_err_limit:
+                    self.logger.exception("Max retries exceeded.")
+                    return []
+                time.sleep(300 if retries == jira_err_limit - 1 else 90)
+        return all_issues
+
     def _paginate_query(
         self,
         query: str,
@@ -141,7 +182,7 @@ class JiraPlus:
         while True:  # pylint: disable=W0149
             try:
                 self.logger.debug(f"Fetching issues from startAt={start_at}")
-                page = self.jira_client.search_issues(
+                page = self.jira_client.enhanced_search_issues(
                     jql_str=query,
                     startAt=start_at,
                     maxResults=max_results,

{python_jira_plus-1.0.15 → python_jira_plus-2.0.2/python_jira_plus.egg-info}/PKG-INFO

@@ -1,32 +1,31 @@
 Metadata-Version: 2.4
 Name: python-jira-plus
-Version: 1.0.15
+Version: 2.0.2
 Summary: Enhanced Python client for JIRA with better error handling, pagination, and metadata validation.
-Home-page: https://github.com/aviz92/python-jira-plus
 Author: Avi Zaguri
-Author-email: 
+License: MIT
+Project-URL: Homepage, https://github.com/aviz92/python-jira-plus
 Project-URL: Repository, https://github.com/aviz92/python-jira-plus
+Project-URL: Issues, https://github.com/aviz92/python-jira-plus/issues
+Keywords: development,jira,atlassian,api,client,python
+Classifier: Development Status :: 4 - Beta
+Classifier: Intended Audience :: Developers
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Operating System :: OS Independent
+Classifier: Topic :: System :: Logging
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: setuptools
-Requires-Dist: wheel
-Requires-Dist: dotenv
-Requires-Dist: pre-commit
-Requires-Dist: custom-python-logger
-Requires-Dist: pytest
-Requires-Dist: requests
-Requires-Dist: retrying
-Requires-Dist: jira
-Dynamic: author
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
+Requires-Dist: custom-python-logger>=2.0.10
+Requires-Dist: dotenv>=0.9.9
+Requires-Dist: jira>=3.10.5
+Requires-Dist: pre-commit>=4.5.0
+Requires-Dist: pytest>=9.0.1
+Requires-Dist: requests>=2.32.5
+Requires-Dist: retrying>=1.4.2
+Requires-Dist: setuptools>=80.9.0
+Requires-Dist: wheel>=0.45.1
 Dynamic: license-file
-Dynamic: project-url
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
 
 # Python JIRA Plus
 An enhanced Python client for JIRA that extends the functionality of the official `jira` package, providing better error handling, pagination, metadata validation, and more.

{python_jira_plus-1.0.15 → python_jira_plus-2.0.2}/python_jira_plus.egg-info/SOURCES.txt

@@ -2,8 +2,6 @@ LICENSE
 MANIFEST.in
 README.md
 pyproject.toml
-requirements.txt
-setup.py
 python_jira_plus/__init__.py
 python_jira_plus/describe_allowed_value.py
 python_jira_plus/jira_plus.py

python_jira_plus-2.0.2/python_jira_plus.egg-info/requires.txt

@@ -0,0 +1,9 @@
+custom-python-logger>=2.0.10
+dotenv>=0.9.9
+jira>=3.10.5
+pre-commit>=4.5.0
+pytest>=9.0.1
+requests>=2.32.5
+retrying>=1.4.2
+setuptools>=80.9.0
+wheel>=0.45.1

python_jira_plus-1.0.15/pyproject.toml

@@ -1,11 +0,0 @@
-[build-system]
-requires = ["setuptools", "wheel"]
-build-backend = "setuptools.build_meta"
-
-[tool.black]
-line-length = 100
-target-version = ["py39", "py310", "py311"]
-
-[tool.isort]
-profile = "black"
-line_length = 100

python_jira_plus-1.0.15/python_jira_plus.egg-info/requires.txt

@@ -1,9 +0,0 @@
-setuptools
-wheel
-dotenv
-pre-commit
-custom-python-logger
-pytest
-requests
-retrying
-jira

python_jira_plus-1.0.15/requirements.txt

@@ -1,9 +0,0 @@
-setuptools
-wheel
-dotenv
-pre-commit
-custom-python-logger
-pytest
-requests
-retrying
-jira

python_jira_plus-1.0.15/setup.py

@@ -1,35 +0,0 @@
-from setuptools import find_packages, setup
-
-package_version = "1.0.15"
-
-package_name = "python-jira-plus"
-package_description = "Enhanced Python client for JIRA with better error handling, pagination, and metadata validation."
-
-package_name_ = package_name.replace("-", "_")
-package_long_description_content_type = "text/markdown"
-package_url = f"https://github.com/aviz92/{package_name}"
-package_python_requires = ">=3.11"
-package_author = "Avi Zaguri"
-
-with open("requirements.txt") as file:
-    package_install_requires = [line.strip() for line in file.readlines() if line.strip() and not line.startswith("#")]
-
-with open("README.md") as file:
-    package_long_description = file.read()
-
-setup(
-    name=package_name,
-    version=package_version,
-    packages=find_packages(include=[package_name_, f"{package_name_}.*"]),
-    install_requires=package_install_requires,
-    author=package_author,
-    author_email="",
-    description=package_description,
-    long_description=package_long_description,
-    long_description_content_type=package_long_description_content_type,
-    url=package_url,
-    project_urls={
-        "Repository": package_url,
-    },
-    python_requires=package_python_requires,
-)