Code review optimizations

Author: v-alexmoraru

src/fabric_cli/commands/fs/fab_fs.py

@@ -301,34 +301,22 @@ def _search_capacity_id(capacity_name: str) -> str | None:
 def _get_capacity_id(
     capacity_name, subscription_id=None, resource_group_name=None
 ) -> str | None:
-    import time
-    
-    max_retries = 3
-    retry_delay = 2  # seconds
-    
-    for attempt in range(max_retries):
-        if subscription_id and resource_group_name:
-            args = Namespace()
-            args.name = capacity_name
-            args.subscription_id = subscription_id
-            args.resource_group_name = resource_group_name
-            try:
-                response = capacity_api.get_capacity(args)
-                if response.status_code == 200:
-                    return json.loads(response.text)["id"]
-            except FabricCLIError:
-                pass  # Continue to fallback search
-        
-        # Fallback to searching across subscriptions
-        capacity_id = _search_capacity_id(capacity_name)
-        if capacity_id:
-            return capacity_id
-            
-        # If not found and we still have retries left, wait and try again
-        if attempt < max_retries - 1:
-            time.sleep(retry_delay)
-    
-    return None
+    if subscription_id and resource_group_name:
+        args = Namespace()
+        args.name = capacity_name
+        args.subscription_id = subscription_id
+        args.resource_group_name = resource_group_name
+        try:
+            response = capacity_api.get_capacity(args)
+        except FabricCLIError:
+            return _search_capacity_id(capacity_name)
+        else:
+            if response.status_code == 200:
+                return json.loads(response.text)["id"]
+            else:
+                return _search_capacity_id(capacity_name)
+    else:
+        return _search_capacity_id(capacity_name)
 
 
 def get_all_az_capacities() -> list:

src/fabric_cli/core/fab_exceptions.py

@@ -5,6 +5,10 @@
 import json
 import re
 
+# Constants for common error messages and codes
+DEFAULT_ERROR_MESSAGE = "An error occurred while processing the operation"
+DEFAULT_ERROR_CODE = "UnknownError"
+
 
 class FabricCLIError(Exception):
     def __init__(self, message, status_code=None):
@@ -70,8 +74,8 @@ def __init__(self, response_text):
             self.more_details: list[dict] = response.get("moreDetails", [])
             self.request_id = response.get("requestId")
         except (json.JSONDecodeError, TypeError):
-            message = "An error occurred while processing the operation"
-            error_code = "UnknownError"
+            message = DEFAULT_ERROR_MESSAGE
+            error_code = DEFAULT_ERROR_CODE
             self.more_details = []
             self.request_id = None
 
@@ -116,15 +120,16 @@ def __init__(self, response_text):
             code (str): The error code returned by the API.
             message (str): A descriptive message about the error.
         """
+        # Initialize properties before parsing
+        self.request_id = None
+        self.timestamp = None
+        
         try:
             response_data = json.loads(response_text) if response_text else {}
             error_data = response_data.get("error", {})
             code = error_data.get("code")
             message = error_data.get("message")
 
-            self.request_id = None
-            self.timestamp = None
-
             if message:
                 message = re.sub(r"\n(?=RequestId:)", "", message)
                 match = re.search(r"RequestId:(\S+)", message)
@@ -138,10 +143,8 @@ def __init__(self, response_text):
                     self.timestamp = match.group(1)
                     message = message.replace(match.group(0), "")
         except (json.JSONDecodeError, TypeError):
-            message = "An error occurred while processing the operation"
-            code = "UnknownError"
-            self.request_id = None
-            self.timestamp = None
+            message = DEFAULT_ERROR_MESSAGE
+            code = DEFAULT_ERROR_CODE
 
         super().__init__(message, code)
 
@@ -198,6 +201,9 @@ def __init__(self, response_text):
             details (list): A list of additional error details, if available.
             additional_info (list): Additional info at the main error level, if available.
         """
+        # Initialize properties before parsing
+        self.request_id = None
+        
         try:
             response_data = json.loads(response_text) if response_text else {}
             error_data = response_data.get("error", {})
@@ -206,16 +212,13 @@ def __init__(self, response_text):
 
             details: list[dict] = error_data.get("details", [])
 
-            # Extract RootActivityId from the details
-            self.request_id = None
             for detail in details:
                 if detail.get("code") == "RootActivityId":
                     self.request_id = detail.get("message")
                     break
         except (json.JSONDecodeError, TypeError):
-            message = "An error occurred while processing the operation"
-            code = "UnknownError"
-            self.request_id = None
+            message = DEFAULT_ERROR_MESSAGE
+            code = DEFAULT_ERROR_CODE
 
         super().__init__(message, code)
 

tests/test_commands/test_import.py

@@ -849,6 +849,7 @@ def _import_create_new_item_success(
     # Setup
     item = item_factory(item_type)
 
+    # TODO: delete this line after mirrored db fix the API GAP for Create
     if item_type == ItemType.MIRRORED_DATABASE:
         time.sleep(60)
 
@@ -897,6 +898,7 @@ def _import_update_existing_item_success(
     # Setup
     item = item_factory(item_type)
 
+    # TODO: delete this line after mirrored db fix the API GAP for Create
     if item_type == ItemType.MIRRORED_DATABASE:
         time.sleep(60)