dtSpark 1.1.0a3__py3-none-any.whl → 1.1.0a6__py3-none-any.whl

dtSpark/aws/pricing.py

@@ -15,6 +15,13 @@ from datetime import datetime, timedelta
 from typing import Dict, Optional, Tuple
 from botocore.exceptions import ClientError
 
+# Model ID constants
+_MODEL_CLAUDE_35_SONNET_V2 = 'anthropic.claude-3-5-sonnet-20241022-v2:0'
+_MODEL_CLAUDE_35_SONNET_V1 = 'anthropic.claude-3-5-sonnet-20240620-v1:0'
+_MODEL_CLAUDE_3_OPUS = 'anthropic.claude-3-opus-20240229-v1:0'
+_MODEL_CLAUDE_3_SONNET = 'anthropic.claude-3-sonnet-20240229-v1:0'
+_MODEL_CLAUDE_3_HAIKU = 'anthropic.claude-3-haiku-20240307-v1:0'
+
 
 class BedrockPricing:
     """Manages AWS Bedrock pricing data and cost calculations."""
@@ -92,7 +99,7 @@ class BedrockPricing:
         # Fall back to hardcoded pricing
         logging.warning("All pricing fetch methods failed, using fallback pricing")
         self._use_fallback_pricing()
-        return True
+        return False
 
     def _fetch_from_bulk_api(self) -> bool:
         """
@@ -163,7 +170,6 @@ class BedrockPricing:
             service_codes = ['AmazonBedrockFoundationModels', 'AmazonBedrockService', 'AmazonBedrock']
 
             all_price_lists = []
-            successful_service_code = None
 
             for service_code in service_codes:
                 try:
@@ -176,7 +182,6 @@ class BedrockPricing:
                     price_list = response.get('PriceList', [])
                     if price_list:
                         all_price_lists.extend(price_list)
-                        successful_service_code = service_code
                         logging.info(f"Found {len(price_list)} products with service code: {service_code}")
 
                         # Continue fetching if there are more results
@@ -359,15 +364,15 @@ class BedrockPricing:
             elif 'sonnet 4' in model_lower or 'sonnet-4' in model_lower:
                 return 'anthropic.claude-sonnet-4-0-v1:0'
             elif '3.5 sonnet v2' in model_lower or '3-5-sonnet-v2' in model_lower:
-                return 'anthropic.claude-3-5-sonnet-20241022-v2:0'
+                return _MODEL_CLAUDE_35_SONNET_V2
             elif '3.5 sonnet' in model_lower or '3-5-sonnet' in model_lower:
-                return 'anthropic.claude-3-5-sonnet-20240620-v1:0'
+                return _MODEL_CLAUDE_35_SONNET_V1
             elif '3 opus' in model_lower or '3-opus' in model_lower:
-                return 'anthropic.claude-3-opus-20240229-v1:0'
+                return _MODEL_CLAUDE_3_OPUS
             elif '3 sonnet' in model_lower or '3-sonnet' in model_lower:
-                return 'anthropic.claude-3-sonnet-20240229-v1:0'
+                return _MODEL_CLAUDE_3_SONNET
             elif '3 haiku' in model_lower or '3-haiku' in model_lower:
-                return 'anthropic.claude-3-haiku-20240307-v1:0'
+                return _MODEL_CLAUDE_3_HAIKU
 
         # Amazon Titan models
         elif 'titan' in model_lower:
@@ -425,7 +430,6 @@ class BedrockPricing:
             for term_key, term_value in on_demand.items():
                 price_dimensions = term_value.get('priceDimensions', {})
                 for dim_key, dim_value in price_dimensions.items():
-                    unit = dim_value.get('unit', '')
                     price_per_unit = float(dim_value.get('pricePerUnit', {}).get('USD', 0))
 
                     # Determine if this is input or output pricing
@@ -484,26 +488,26 @@ class BedrockPricing:
         # Fallback pricing for common models (prices per 1000 tokens)
         fallback = {
             # Claude 3.5 Sonnet v2
-            ('anthropic.claude-3-5-sonnet-20241022-v2:0', 'us-east-1'): {'input': 0.003, 'output': 0.015},
-            ('anthropic.claude-3-5-sonnet-20241022-v2:0', 'us-west-2'): {'input': 0.003, 'output': 0.015},
-            ('anthropic.claude-3-5-sonnet-20241022-v2:0', 'ap-southeast-2'): {'input': 0.003, 'output': 0.015},
+            (_MODEL_CLAUDE_35_SONNET_V2, 'us-east-1'): {'input': 0.003, 'output': 0.015},
+            (_MODEL_CLAUDE_35_SONNET_V2, 'us-west-2'): {'input': 0.003, 'output': 0.015},
+            (_MODEL_CLAUDE_35_SONNET_V2, 'ap-southeast-2'): {'input': 0.003, 'output': 0.015},
 
             # Claude 3.5 Sonnet v1
-            ('anthropic.claude-3-5-sonnet-20240620-v1:0', 'us-east-1'): {'input': 0.003, 'output': 0.015},
-            ('anthropic.claude-3-5-sonnet-20240620-v1:0', 'us-west-2'): {'input': 0.003, 'output': 0.015},
-            ('anthropic.claude-3-5-sonnet-20240620-v1:0', 'ap-southeast-2'): {'input': 0.003, 'output': 0.015},
+            (_MODEL_CLAUDE_35_SONNET_V1, 'us-east-1'): {'input': 0.003, 'output': 0.015},
+            (_MODEL_CLAUDE_35_SONNET_V1, 'us-west-2'): {'input': 0.003, 'output': 0.015},
+            (_MODEL_CLAUDE_35_SONNET_V1, 'ap-southeast-2'): {'input': 0.003, 'output': 0.015},
 
             # Claude 3 Opus
-            ('anthropic.claude-3-opus-20240229-v1:0', 'us-east-1'): {'input': 0.015, 'output': 0.075},
-            ('anthropic.claude-3-opus-20240229-v1:0', 'us-west-2'): {'input': 0.015, 'output': 0.075},
+            (_MODEL_CLAUDE_3_OPUS, 'us-east-1'): {'input': 0.015, 'output': 0.075},
+            (_MODEL_CLAUDE_3_OPUS, 'us-west-2'): {'input': 0.015, 'output': 0.075},
 
             # Claude 3 Sonnet
-            ('anthropic.claude-3-sonnet-20240229-v1:0', 'us-east-1'): {'input': 0.003, 'output': 0.015},
-            ('anthropic.claude-3-sonnet-20240229-v1:0', 'us-west-2'): {'input': 0.003, 'output': 0.015},
+            (_MODEL_CLAUDE_3_SONNET, 'us-east-1'): {'input': 0.003, 'output': 0.015},
+            (_MODEL_CLAUDE_3_SONNET, 'us-west-2'): {'input': 0.003, 'output': 0.015},
 
             # Claude 3 Haiku
-            ('anthropic.claude-3-haiku-20240307-v1:0', 'us-east-1'): {'input': 0.00025, 'output': 0.00125},
-            ('anthropic.claude-3-haiku-20240307-v1:0', 'us-west-2'): {'input': 0.00025, 'output': 0.00125},
+            (_MODEL_CLAUDE_3_HAIKU, 'us-east-1'): {'input': 0.00025, 'output': 0.00125},
+            (_MODEL_CLAUDE_3_HAIKU, 'us-west-2'): {'input': 0.00025, 'output': 0.00125},
         }
 
         self.pricing_data = fallback

dtSpark/cli_interface.py

@@ -27,6 +27,17 @@ import time
 import re
 
 
+# Common style and message string constants (SonarCloud S1192)
+_STYLE_BOLD_CYAN = "bold cyan"
+_STYLE_BOLD_YELLOW = "bold yellow"
+_STYLE_BOLD_MAGENTA = "bold magenta"
+_MSG_INVALID_SELECTION = "Invalid selection"
+_MSG_CANCEL_OPTION = "  [0] Cancel"
+_MSG_ENTER_CHOICE = "Enter choice"
+_MSG_INVALID_CHOICE = "Invalid choice"
+_MSG_INVALID_INPUT = "Invalid input"
+
+
 def extract_friendly_model_name(model_id: str) -> str:
     """
     Extract a human-friendly model name from a full model ID or ARN.
@@ -221,9 +232,10 @@ class CLIInterface:
         self.running = True
         self.model_changing_enabled = True  # Can be disabled if model is locked via config
         self.cost_tracking_enabled = False  # Can be enabled via config
+        self.actions_enabled = False  # Can be enabled via autonomous_actions.enabled config
         self._active_status_indicator = None  # Track active status indicator for pause/resume
 
-    def print_splash_screen(self, full_name: str, description: str, version: str):
+    def print_splash_screen(self, full_name: str, description: str, version: str):  # noqa: S1172
         """
         Print application splash screen with SPARK branding.
 
@@ -286,7 +298,7 @@ class CLIInterface:
         # This is now replaced by print_splash_screen
         pass
 
-    def create_progress(self, description: str = "Initialising...") -> Progress:
+    def create_progress(self, description: str = "Initialising...") -> Progress:  # noqa: S1172
         """
         Create a progress bar for tracking operations.
 
@@ -385,12 +397,13 @@ class CLIInterface:
         choice_map[str(option_num)] = 'list'
         option_num += 1
 
-        # Manage Autonomous Actions
-        menu_content.append("  ", style="")
-        menu_content.append(str(option_num), style="cyan")
-        menu_content.append(". Manage Autonomous Actions\n", style="")
-        choice_map[str(option_num)] = 'autonomous'
-        option_num += 1
+        # Manage Autonomous Actions (only when enabled)
+        if self.actions_enabled:
+            menu_content.append("  ", style="")
+            menu_content.append(str(option_num), style="cyan")
+            menu_content.append(". Manage Autonomous Actions\n", style="")
+            choice_map[str(option_num)] = 'autonomous'
+            option_num += 1
 
         # Quit
         menu_content.append("  ", style="")
@@ -402,7 +415,7 @@ class CLIInterface:
         menu_panel = Panel(
             menu_content,
             title="[bold bright_magenta]MAIN MENU[/bold bright_magenta]",
-            border_style="bold cyan",
+            border_style=_STYLE_BOLD_CYAN,
             box=box.HEAVY,
             padding=(0, 1)
         )
@@ -562,7 +575,7 @@ class CLIInterface:
         """
         # Create table
         table = Table(show_header=False, box=box.ROUNDED, border_style="cyan")
-        table.add_column("No.", style="bold yellow", width=4)
+        table.add_column("No.", style=_STYLE_BOLD_YELLOW, width=4)
         table.add_column("Option", style="white")
 
         for i, option in enumerate(options, 1):
@@ -587,7 +600,7 @@ class CLIInterface:
             elif choice == len(options) + 1:
                 return -1
             else:
-                self.print_error("Invalid selection")
+                self.print_error(_MSG_INVALID_SELECTION)
                 return -1
         except ValueError:
             self.print_error("Please enter a valid number")
@@ -612,7 +625,7 @@ class CLIInterface:
 
         self.console.print()
         self.print_separator("─")
-        self.console.print(f"\n[bold yellow]🔐 Tool Permission Request[/bold yellow]")
+        self.console.print("\n[bold yellow]🔐 Tool Permission Request[/bold yellow]")
         self.console.print(f"\nThe assistant wants to use the tool: [bold cyan]{tool_name}[/bold cyan]")
 
         if tool_description:
@@ -665,11 +678,11 @@ class CLIInterface:
         # Create table
         table = Table(
             show_header=True,
-            header_style="bold magenta",
+            header_style=_STYLE_BOLD_MAGENTA,
             box=box.ROUNDED,
             border_style="cyan"
         )
-        table.add_column("No.", style="bold yellow", width=4)
+        table.add_column("No.", style=_STYLE_BOLD_YELLOW, width=4)
         table.add_column("Model Name", style="cyan")
         table.add_column("Provider", style="green")
         table.add_column("Access Method", style="magenta")
@@ -716,7 +729,7 @@ class CLIInterface:
             if 1 <= choice <= len(models):
                 return models[choice - 1]['id']
             else:
-                self.print_error("Invalid selection")
+                self.print_error(_MSG_INVALID_SELECTION)
                 return None
         except ValueError:
             self.print_error("Please enter a valid number or Q to quit")
@@ -739,11 +752,11 @@ class CLIInterface:
         # Create table
         table = Table(
             show_header=True,
-            header_style="bold magenta",
+            header_style=_STYLE_BOLD_MAGENTA,
             box=box.ROUNDED,
             border_style="cyan"
         )
-        table.add_column("No.", style="bold yellow", width=4)
+        table.add_column("No.", style=_STYLE_BOLD_YELLOW, width=4)
         table.add_column("Name", style="cyan")
         table.add_column("Model", style="green")
         table.add_column("Created", style="blue")
@@ -789,7 +802,7 @@ class CLIInterface:
             if 1 <= choice <= len(conversations):
                 return conversations[choice - 1]['id']
             else:
-                self.print_error("Invalid selection")
+                self.print_error(_MSG_INVALID_SELECTION)
                 return None
         except ValueError:
             self.print_error("Please enter a valid number or 'N' for new conversation")
@@ -847,7 +860,7 @@ class CLIInterface:
         self.console.print()
         self.console.print(Panel(
             "[bold]Conversation History[/bold]",
-            style="bold magenta",
+            style=_STYLE_BOLD_MAGENTA,
             box=box.DOUBLE
         ))
 
@@ -879,7 +892,7 @@ class CLIInterface:
 
         # Create info table
         table = Table(show_header=False, box=None, padding=(0, 2))
-        table.add_column("Label", style="bold cyan")
+        table.add_column("Label", style=_STYLE_BOLD_CYAN)
         table.add_column("Value", style="white")
 
         table.add_row("Conversation", conversation['name'])
@@ -900,12 +913,7 @@ class CLIInterface:
 
         # Add instructions indicator
         if conversation.get('instructions'):
-            if detailed:
-                # In detailed view, show YES and we'll display full instructions below
-                table.add_row("Instructions", "[green]YES[/green]")
-            else:
-                # In regular view, just show YES
-                table.add_row("Instructions", "[green]YES[/green]")
+            table.add_row("Instructions", "[green]YES[/green]")
         else:
             table.add_row("Instructions", "[dim]NO[/dim]")
 
@@ -1104,7 +1112,7 @@ class CLIInterface:
             try:
                 from dtSpark import launch
                 version = launch.version()
-            except:
+            except ImportError:
                 version = "X.X"
 
         # Get log path
@@ -1171,7 +1179,7 @@ class CLIInterface:
         # Create table for server details
         table = Table(
             show_header=True,
-            header_style="bold magenta",
+            header_style=_STYLE_BOLD_MAGENTA,
             box=box.ROUNDED,
             border_style="green"
         )
@@ -1345,7 +1353,7 @@ class CLIInterface:
         # Budget section
         if budget_limit > 0:
             content_parts.append("")
-            content_parts.append(f"[bold cyan]Budget Status:[/bold cyan]")
+            content_parts.append("[bold cyan]Budget Status:[/bold cyan]")
             content_parts.append(f"    • Budget Limit: [yellow]${budget_limit:.2f} USD[/yellow]")
 
             if budget_exceeded:
@@ -1473,7 +1481,7 @@ class CLIInterface:
             f"[dim]({input_str})[/dim]"
         )
 
-    def display_tool_result(self, tool_name: str, result: str, is_error: bool = False):
+    def display_tool_result(self, tool_name: str, result: str, is_error: bool = False):  # noqa: S1172
         """
         Display a tool result during chat.
 
@@ -1555,7 +1563,7 @@ class CLIInterface:
                     found_files = FileManager.scan_directory(str(path.absolute()), recursive=recursive)
 
                     if not found_files:
-                        self.print_warning(f"  No supported files found in directory")
+                        self.print_warning("  No supported files found in directory")
                         continue
 
                     self.print_success(f"  Found {len(found_files)} supported file(s)")
@@ -1605,7 +1613,6 @@ class CLIInterface:
 
             else:
                 self.print_error(f"Invalid path type: {input_path}")
-                continue
 
         if file_attachments:
             self.console.print()
@@ -1636,7 +1643,7 @@ class CLIInterface:
         # Create table for attached files
         table = Table(
             show_header=True,
-            header_style="bold magenta",
+            header_style=_STYLE_BOLD_MAGENTA,
             box=box.ROUNDED,
             border_style="blue"
         )
@@ -1700,7 +1707,7 @@ class CLIInterface:
         # Create table for transactions
         table = Table(
             show_header=True,
-            header_style="bold magenta",
+            header_style=_STYLE_BOLD_MAGENTA,
             box=box.ROUNDED,
             border_style="yellow"
         )
@@ -1746,7 +1753,7 @@ class CLIInterface:
 
         # Create details table
         details_table = Table(show_header=False, box=None, padding=(0, 2))
-        details_table.add_column("Label", style="bold yellow")
+        details_table.add_column("Label", style=_STYLE_BOLD_YELLOW)
         details_table.add_column("Value", style="white")
 
         timestamp = datetime.fromisoformat(transaction['transaction_timestamp'])
@@ -1781,7 +1788,7 @@ class CLIInterface:
         self.console.print()
         try:
             input_formatted = json.dumps(json.loads(transaction['tool_input']), indent=2)
-        except:
+        except ValueError:
             input_formatted = transaction['tool_input']
 
         self.console.print(Panel(
@@ -1812,7 +1819,7 @@ class CLIInterface:
         """
         # Create stats table
         stats_table = Table(show_header=False, box=None, padding=(0, 2))
-        stats_table.add_column("Metric", style="bold yellow")
+        stats_table.add_column("Metric", style=_STYLE_BOLD_YELLOW)
         stats_table.add_column("Value", style="white")
 
         stats_table.add_row("Total Transactions", f"{stats['total_transactions']:,}")
@@ -1831,7 +1838,7 @@ class CLIInterface:
             self.console.print()
             tools_table = Table(
                 show_header=True,
-                header_style="bold magenta",
+                header_style=_STYLE_BOLD_MAGENTA,
                 box=box.ROUNDED,
                 border_style="green"
             )
@@ -1852,7 +1859,7 @@ class CLIInterface:
             self.console.print()
             conv_table = Table(
                 show_header=True,
-                header_style="bold magenta",
+                header_style=_STYLE_BOLD_MAGENTA,
                 box=box.ROUNDED,
                 border_style="cyan"
             )
@@ -1885,7 +1892,7 @@ class CLIInterface:
 
         table = Table(
             show_header=True,
-            header_style="bold magenta",
+            header_style=_STYLE_BOLD_MAGENTA,
             box=box.ROUNDED,
             border_style="cyan"
         )
@@ -2046,9 +2053,9 @@ class CLIInterface:
         for i, state in enumerate(server_states, 1):
             status = "[green]enabled[/green]" if state['enabled'] else "[red]disabled[/red]"
             self.console.print(f"  [{i}] {state['server_name']} ({status})")
-        self.console.print("  [0] Cancel")
+        self.console.print(_MSG_CANCEL_OPTION)
 
-        choice = self.get_input("Enter choice")
+        choice = self.get_input(_MSG_ENTER_CHOICE)
         try:
             idx = int(choice)
             if idx == 0:
@@ -2056,10 +2063,10 @@ class CLIInterface:
             if 1 <= idx <= len(server_states):
                 return server_states[idx - 1]['server_name']
             else:
-                self.print_error("Invalid choice")
+                self.print_error(_MSG_INVALID_CHOICE)
                 return None
         except ValueError:
-            self.print_error("Invalid input")
+            self.print_error(_MSG_INVALID_INPUT)
             return None
 
     # =========================================================================
@@ -2103,7 +2110,7 @@ class CLIInterface:
         menu_panel = Panel(
             menu_content,
             title="[bold bright_magenta]AUTONOMOUS ACTIONS[/bold bright_magenta]",
-            border_style="bold cyan",
+            border_style=_STYLE_BOLD_CYAN,
             box=box.HEAVY,
             padding=(0, 1)
         )
@@ -2149,7 +2156,7 @@ class CLIInterface:
 
         table = Table(
             show_header=True,
-            header_style="bold magenta",
+            header_style=_STYLE_BOLD_MAGENTA,
             box=box.ROUNDED,
             border_style="cyan"
         )
@@ -2229,7 +2236,7 @@ class CLIInterface:
 
         table = Table(
             show_header=True,
-            header_style="bold magenta",
+            header_style=_STYLE_BOLD_MAGENTA,
             box=box.ROUNDED,
             border_style="cyan"
         )
@@ -2264,7 +2271,7 @@ class CLIInterface:
                         completed = datetime.fromisoformat(completed.replace('Z', '+00:00'))
                     duration = (completed - started).total_seconds()
                     duration_str = f"{duration:.1f}s"
-                except:
+                except (ValueError, TypeError):
                     duration_str = "N/A"
             else:
                 duration_str = "N/A"
@@ -2347,9 +2354,9 @@ class CLIInterface:
         for i, action in enumerate(actions, 1):
             status = "[green]enabled[/green]" if action['is_enabled'] else "[red]disabled[/red]"
             self.console.print(f"  [{i}] {action['name']} ({status})")
-        self.console.print("  [0] Cancel")
+        self.console.print(_MSG_CANCEL_OPTION)
 
-        choice = self.get_input("Enter choice")
+        choice = self.get_input(_MSG_ENTER_CHOICE)
         try:
             idx = int(choice)
             if idx == 0:
@@ -2357,10 +2364,10 @@ class CLIInterface:
             if 1 <= idx <= len(actions):
                 return actions[idx - 1]['id']
             else:
-                self.print_error("Invalid choice")
+                self.print_error(_MSG_INVALID_CHOICE)
                 return None
         except ValueError:
-            self.print_error("Invalid input")
+            self.print_error(_MSG_INVALID_INPUT)
             return None
 
     def select_run(self, runs: List[Dict], prompt: str = "Select a run") -> Optional[int]:
@@ -2383,9 +2390,9 @@ class CLIInterface:
             status = run.get('status', 'unknown')
             started = str(run.get('started_at', ''))[:16]
             self.console.print(f"  [{i}] Run {run['id']} - {status} ({started})")
-        self.console.print("  [0] Cancel")
+        self.console.print(_MSG_CANCEL_OPTION)
 
-        choice = self.get_input("Enter choice")
+        choice = self.get_input(_MSG_ENTER_CHOICE)
         try:
             idx = int(choice)
             if idx == 0:
@@ -2393,10 +2400,10 @@ class CLIInterface:
             if 1 <= idx <= len(runs):
                 return runs[idx - 1]['id']
             else:
-                self.print_error("Invalid choice")
+                self.print_error(_MSG_INVALID_CHOICE)
                 return None
         except ValueError:
-            self.print_error("Invalid input")
+            self.print_error(_MSG_INVALID_INPUT)
             return None
 
     def select_export_format(self) -> Optional[str]:
@@ -2410,9 +2417,9 @@ class CLIInterface:
         self.console.print("  [1] Plain Text")
         self.console.print("  [2] HTML")
         self.console.print("  [3] Markdown")
-        self.console.print("  [0] Cancel")
+        self.console.print(_MSG_CANCEL_OPTION)
 
-        choice = self.get_input("Enter choice")
+        choice = self.get_input(_MSG_ENTER_CHOICE)
         format_map = {'1': 'text', '2': 'html', '3': 'markdown'}
         return format_map.get(choice)
 
@@ -2459,7 +2466,7 @@ class CLIInterface:
             friendly_name = extract_friendly_model_name(model.get('id', ''))
             self.console.print(f"  [{i}] {friendly_name}")
 
-        model_choice = self.get_input("Enter choice")
+        model_choice = self.get_input(_MSG_ENTER_CHOICE)
         try:
             model_idx = int(model_choice) - 1
             if model_idx < 0 or model_idx >= len(available_models):
@@ -2467,7 +2474,7 @@ class CLIInterface:
                 return None
             model_id = available_models[model_idx]['id']
         except ValueError:
-            self.print_error("Invalid input")
+            self.print_error(_MSG_INVALID_INPUT)
             return None
 
         # Step 5: Schedule type
@@ -2475,7 +2482,7 @@ class CLIInterface:
         self.console.print("  [1] One-off (run once at specific time)")
         self.console.print("  [2] Recurring (run on schedule)")
 
-        schedule_choice = self.get_input("Enter choice")
+        schedule_choice = self.get_input(_MSG_ENTER_CHOICE)
         if schedule_choice == '1':
             schedule_type = 'one_off'
             self.console.print("\n[dim]Enter date/time in format: YYYY-MM-DD HH:MM[/dim]")
@@ -2504,7 +2511,7 @@ class CLIInterface:
         self.console.print("  [1] Fresh - Start with clean context each run")
         self.console.print("  [2] Cumulative - Carry context from previous runs")
 
-        context_choice = self.get_input("Enter choice")
+        context_choice = self.get_input(_MSG_ENTER_CHOICE)
         context_mode = 'cumulative' if context_choice == '2' else 'fresh'
 
         # Step 7: Max failures