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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-jira-plus
-Version: 1.0.3
+Version: 1.0.5
 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.3 → python_jira_plus-1.0.5}/python_jira_plus/jira_plus.py

@@ -21,33 +21,43 @@ class ServerType(Enum):
 
 class JiraPlus:
     def __init__(
-        self, base_url: Optional[str] = None,
-        server_type: ServerType = ServerType.CLOUD,
-        urllib3_log_level: int = logging.WARNING
+            self, base_url: Optional[str] = None,
+            server_type: ServerType = ServerType.CLOUD,
+            urllib3_log_level: int = logging.WARNING,
+            jira_username: Optional[str] = None,
+            jira_token: Optional[str] = None,  # Use API token (not PAT)
+            verify_ssl: bool = True,
+            sso: bool = False
     ) -> None:
         self.logger = logging.getLogger()
         logging.getLogger("urllib3").setLevel(urllib3_log_level)
 
-        self.jira_username = os.getenv('JIRA_USER_NAME')
-        self.jira_token = os.getenv('JIRA_TOKEN')
-
-        if not base_url:
-            self.base_url = os.getenv('JIRA_BASE_URL')
+        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.server_type = server_type
         self.server = f'https://{self.base_url}'
+        self.verify_ssl = verify_ssl
+        self.sso = sso
 
         self.jira_client = self.create_connection()
         self.check_client_connection()
 
-    @retry(stop_max_attempt_number=3,
-           wait_fixed=180000)  # Retry 3 times with a 3-min (180000) delay between each attempt
-    def create_connection(self) -> Optional[JIRA]:
-        jira_client = JIRA(
-            basic_auth=(self.jira_username, self.jira_token),
-            options={'server': self.server},
-            timeout=580
-        )
+    @retry(stop_max_attempt_number=3, wait_fixed=180000)  # Retry 3 times with a 3-min (180000) delay between each attempt
+    def create_connection(self, timeout=580) -> Optional[JIRA]:
+        if self.server_type == ServerType.ON_PREMISE and not self.sso:
+            jira_client = JIRA(
+                token_auth=self.jira_token,
+                options={'server': self.server},
+                timeout=timeout
+            )
+        else:
+            jira_client = JIRA(
+                basic_auth=(self.jira_username, self.jira_token),
+                options={'server': self.server},
+                timeout=timeout
+            )
 
         if jira_client.projects():
             self.logger.info(f"Jira Connection Successful")
@@ -81,10 +91,10 @@ class JiraPlus:
             return False
 
     def get_issue_by_key(
-        self,
-        key: str,
-        specific_fields: str | list[str] = '*all',
-        json_result: bool = True
+            self,
+            key: str,
+            specific_fields: str | list[str] = '*all',
+            json_result: bool = True
     ) -> None | Issue | dict[str, Any]:
         try:
             jira_issue = self.jira_client.issue(id=key, fields=specific_fields)
@@ -99,12 +109,12 @@ class JiraPlus:
             return None
 
     def get_objects_by_query(
-        self,
-        query: str,
-        max_results: int = 5000,
-        specific_fields: Union[str, list[str]] = "*all",
-        jira_err_count: int = 3,
-        json_result: bool = True,
+            self,
+            query: str,
+            max_results: int = 5000,
+            specific_fields: Union[str, list[str]] = "*all",
+            jira_err_count: int = 3,
+            json_result: bool = True,
     ) -> Optional[Union[ResultList[Issue], dict]]:
         return self._paginate_query(
             query=query,
@@ -115,12 +125,12 @@ class JiraPlus:
         )
 
     def _paginate_query(
-        self,
-        query: str,
-        max_results: int,
-        specific_fields: Union[str, list[str]],
-        jira_err_limit: int,
-        json_result: bool
+            self,
+            query: str,
+            max_results: int,
+            specific_fields: Union[str, list[str]],
+            jira_err_limit: int,
+            json_result: bool
     ) -> Union[ResultList[Issue] | list]:
         start_at = 0
         all_issues = []
@@ -172,10 +182,10 @@ class JiraPlus:
         return meta, issue_meta
 
     def get_allowed_values(
-        self,
-        project_key: str,
-        issue_type: str,
-        field_id_or_name: str,
+            self,
+            project_key: str,
+            issue_type: str,
+            field_id_or_name: str,
     ) -> Optional[list]:
         """
         Returns the allowed values for a specific field in a project + issue type context.
@@ -209,10 +219,10 @@ class JiraPlus:
         return describe_allowed_value(value, allowed_values=allowed_values)
 
     def validate_fields(
-        self,
-        project_key: str,
-        issue_type: str,
-        fields: Optional[dict] = None
+            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']
@@ -246,13 +256,13 @@ class JiraPlus:
         return issue_meta['fields'].keys()
 
     def create_issue(
-        self,
-        project_key: str,
-        summary: str,
-        description: str,
-        issue_type: str,
-        assignee: Optional[str] = None,
-        custom_fields: Optional[dict] = None,
+            self,
+            project_key: str,
+            summary: str,
+            description: str,
+            issue_type: str,
+            assignee: Optional[str] = None,
+            custom_fields: Optional[dict] = None,
     ) -> Optional[Issue]:
         issue_fields = {
             "project": {"key": project_key},
@@ -261,7 +271,8 @@ class JiraPlus:
             "description": description,
         }
         if assignee:
-            issue_fields["assignee"] = {"accountId": assignee} if self.server_type == ServerType.CLOUD else {"name": assignee}
+            issue_fields["assignee"] = {"accountId": assignee} if self.server_type == ServerType.CLOUD else {
+                "name": assignee}
 
         if custom_fields:
             issue_fields = issue_fields | custom_fields
@@ -279,9 +290,9 @@ class JiraPlus:
             return None
 
     def update_issue(
-        self,
-        issue_key: str,
-        fields_to_update: dict
+            self,
+            issue_key: str,
+            fields_to_update: dict
     ) -> Optional[Issue]:
         try:
             issue = self.jira_client.issue(issue_key)
@@ -350,11 +361,11 @@ class JiraPlus:
             self.logger.exception(f"Exception - Attachment {file_path} was not uploaded to issue {issue_key}\n{err}")
 
     def transition_issue(
-        self,
-        issue_key: str,
-        transition_name: str,
-        fields: Optional[dict] = None,
-        comment: Optional[str] = None,
+            self,
+            issue_key: str,
+            transition_name: str,
+            fields: Optional[dict] = None,
+            comment: Optional[str] = None,
     ) -> bool:
         try:
             transitions = self.jira_client.transitions(issue_key)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-jira-plus
-Version: 1.0.3
+Version: 1.0.5
 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.3 → python_jira_plus-1.0.5}/setup.py

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