python-jira-plus 1.0.5__tar.gz → 1.0.7__tar.gz

{python_jira_plus-1.0.5/python_jira_plus.egg-info → python_jira_plus-1.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-jira-plus
-Version: 1.0.5
+Version: 1.0.7
 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

{python_jira_plus-1.0.5 → python_jira_plus-1.0.7}/python_jira_plus/jira_plus.py

@@ -14,6 +14,11 @@ from retrying import retry
 from python_jira_plus.describe_allowed_value import describe_allowed_value
 
 
+class UrlScheme(Enum):
+    HTTP = 'http'
+    HTTPS = 'https'
+
+
 class ServerType(Enum):
     CLOUD = 'cloud'
     ON_PREMISE = 'on_premise'
@@ -27,7 +32,8 @@ class JiraPlus:
             jira_username: Optional[str] = None,
             jira_token: Optional[str] = None,  # Use API token (not PAT)
             verify_ssl: bool = True,
-            sso: bool = False
+            sso: bool = False,
+            url_scheme: UrlScheme = UrlScheme.HTTPS
     ) -> None:
         self.logger = logging.getLogger()
         logging.getLogger("urllib3").setLevel(urllib3_log_level)
@@ -35,9 +41,10 @@ class JiraPlus:
         self.jira_username = jira_username or os.getenv('JIRA_USER_NAME')
         self.jira_token = jira_token or os.getenv('JIRA_TOKEN')
         self.base_url = base_url or os.getenv('JIRA_BASE_URL')
+        self.url_scheme = url_scheme.value
 
         self.server_type = server_type
-        self.server = f'https://{self.base_url}'
+        self.server = f'{self.url_scheme}://{self.base_url}'
         self.verify_ssl = verify_ssl
         self.sso = sso
 
@@ -49,13 +56,13 @@ class JiraPlus:
         if self.server_type == ServerType.ON_PREMISE and not self.sso:
             jira_client = JIRA(
                 token_auth=self.jira_token,
-                options={'server': self.server},
+                options={'server': self.server, 'verify': self.verify_ssl},
                 timeout=timeout
             )
         else:
             jira_client = JIRA(
                 basic_auth=(self.jira_username, self.jira_token),
-                options={'server': self.server},
+                options={'server': self.server, 'verify': self.verify_ssl},
                 timeout=timeout
             )
 
@@ -190,13 +197,16 @@ class JiraPlus:
         """
         Returns the allowed values for a specific field in a project + issue type context.
         """
-        _, issue_meta = self._fetch_metadata(project_key=project_key, issue_type=issue_type)
+        fields_metadata = self.get_project_fields_metadata(
+            project_key=project_key,
+            issue_type=issue_type
+        )
 
         # Try to find by ID or fallback to case-insensitive name
-        field = issue_meta['fields'].get(field_id_or_name)
+        field = fields_metadata.get(field_id_or_name)
         if not field:
             # Try matching by name (case-insensitive)
-            for fid, fmeta in issue_meta['fields'].items():
+            for fid, fmeta in fields_metadata.items():
                 if fmeta['name'].lower() == field_id_or_name.lower():
                     field = fmeta
                     break
@@ -218,28 +228,53 @@ class JiraPlus:
         allowed_values = allowed_names | allowed_keys
         return describe_allowed_value(value, allowed_values=allowed_values)
 
+    def get_server_version(self):
+        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 server_version < (8, 0, 0):
+            self.logger.warning(
+                f"JIRA server version {server_version} is below the minimum required version (8.0.0). "
+                "Some features may not work as expected."
+            )
+            return False
+        return True
+
+    def get_project_fields_metadata(self, project_key: str, issue_type: str) -> dict:
+        if self.check_server_createmeta_compatibility():
+            meta, issue_meta = self._fetch_metadata(project_key=project_key, issue_type=issue_type)
+            return issue_meta['fields']
+        else:
+            _project_issue_types = self.jira_client.project_issue_types(project_key)
+            _issue_types = {t.name: t for t in _project_issue_types}
+            field_list = self.jira_client.project_issue_fields(project_key, _issue_types[issue_type].id)
+            return {f.fieldId: f.raw for f in field_list}
+
     def validate_fields(
             self,
             project_key: str,
             issue_type: str,
             fields: Optional[dict] = None
     ) -> None:
-        meta, issue_meta = self._fetch_metadata(project_key=project_key, issue_type=issue_type)
-        field_types = meta['projects'][0]['issuetypes'][0]['fields']
+        fields_metadata = self.get_project_fields_metadata(
+            project_key=project_key,
+            issue_type=issue_type
+        )
         for custom_field, value in fields.items():
-            if custom_field not in issue_meta['fields']:
+            if custom_field not in fields_metadata:
                 raise ValueError(
                     f'Invalid field(s) for project "{project_key}", issue type "{issue_type}": "{custom_field}"'
                 )
 
-            if allowed_value := issue_meta['fields'][custom_field].get('allowedValues'):
+            if allowed_value := fields_metadata[custom_field].get('allowedValues'):
                 if not self._is_value_allowed(value=value, allowed_values=allowed_value):
                     raise ValueError(
                         f"Invalid value '{value}' for field '{custom_field}' in project '{project_key}' with issue type '{issue_type}'."
                         f"The allowed values are: {json.dumps(allowed_value, indent=4, sort_keys=True)}"
                     )
 
-            field_type = field_types[custom_field]['schema']['type']
+            field_type = fields_metadata[custom_field]['schema']['type']
             if field_type == 'string' and not isinstance(value, str):
                 raise ValueError(f"Field '{custom_field}' must be a string")
             elif field_type == 'number' and not isinstance(value, (int, float)):
@@ -253,7 +288,6 @@ class JiraPlus:
             elif field_type == 'issuetype' and not isinstance(value, dict):
                 raise ValueError(f"Field '{custom_field}' must be an issue type")
             # Add more field type checks as needed
-        return issue_meta['fields'].keys()
 
     def create_issue(
             self,

{python_jira_plus-1.0.5 → python_jira_plus-1.0.7/python_jira_plus.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-jira-plus
-Version: 1.0.5
+Version: 1.0.7
 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

{python_jira_plus-1.0.5 → python_jira_plus-1.0.7}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-package_version = '1.0.5'
+package_version = '1.0.7'
 
 package_name = 'python-jira-plus'
 package_description = 'Enhanced Python client for JIRA with better error handling, pagination, and metadata validation.'