aceiot-models-cli 0.3.0__tar.gz → 0.3.2__tar.gz

{aceiot_models_cli-0.3.0 → aceiot_models_cli-0.3.2}/CHANGELOG.md

@@ -5,6 +5,25 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.3.2] - 2025-07-26
+
+### Changed
+- Code formatting improvements for consistency
+- Minor code style updates to comply with project standards
+
+## [0.3.1] - 2025-07-25
+
+### Fixed
+- Addressed all ruff linting issues (trailing whitespace, formatting)
+- Fixed pyright type checking errors
+- Resolved undefined variable issues in volttron commands
+- Fixed type annotations for better type safety
+- Updated error handling tests to match new client/gateway fallback logic
+
+### Changed
+- Improved variable initialization to prevent runtime errors
+- Enhanced type safety with proper type guards
+
 ## [0.3.0] - 2025-07-25
 
 ### Added

{aceiot_models_cli-0.3.0 → aceiot_models_cli-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aceiot-models-cli
-Version: 0.3.0
+Version: 0.3.2
 Summary: Command-line interface for ACE IoT Aerodrome API using aceiot-models package
 Project-URL: Homepage, https://github.com/ACE-IoT-Solutions/aceiot-models-cli
 Project-URL: Repository, https://github.com/ACE-IoT-Solutions/aceiot-models-cli

{aceiot_models_cli-0.3.0 → aceiot_models_cli-0.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aceiot-models-cli"
-version = "0.3.0"
+version = "0.3.2"
 description = "Command-line interface for ACE IoT Aerodrome API using aceiot-models package"
 readme = "README.md"
 authors = [

{aceiot_models_cli-0.3.0 → aceiot_models_cli-0.3.2}/src/aceiot_models_cli/cli.py

@@ -7,13 +7,6 @@ from aceiot_models import (
 from aceiot_models.api import APIClient
 from click import Context
 from rich.console import Console
-from rich.progress import (
-    BarColumn,
-    MofNCompleteColumn,
-    Progress,
-    SpinnerColumn,
-    TextColumn,
-)
 
 from .config import load_config
 from .formatters import format_json, format_table, print_error, print_success
@@ -376,16 +369,16 @@ def site_timeseries(
         # Need to determine format before creating default filename
         if format == "auto":
             format = "csv"  # Default to CSV when no file specified
-        
+
         # Clean up timestamps for filename (remove colons and timezone indicators)
         start_clean = start.replace(':', '-').replace('Z', '').replace('+', '_')
         end_clean = end.replace(':', '-').replace('Z', '').replace('+', '_')
-        
+
         # Use appropriate extension based on format
         extension = ".parquet" if format == "parquet" else ".csv"
         output_file = f"{site_name}-{start_clean}-{end_clean}{extension}"
         console.print(f"[yellow]Using default output file: {output_file}[/yellow]")
-    
+
     # Now handle the case where output_file was provided
     output_path = Path(output_file)
     if format == "auto" and output_file:  # Only auto-detect if file was provided
@@ -400,7 +393,7 @@ def site_timeseries(
             if not output_path.suffix:
                 output_path = output_path.with_suffix('.csv')
                 output_file = str(output_path)
-    
+
     # Ensure output_path is always a Path object
     output_path = Path(output_file)
 
@@ -428,12 +421,12 @@ def site_timeseries(
         # Get unique points from the data
         unique_points = {sample.get("name") for sample in all_samples if sample.get("name")}
         console.print(f"[green]✓ Fetched {len(all_samples)} data samples from {len(unique_points)} points[/green]")
-        
+
         # If metadata is requested, fetch point details
         point_metadata = {}
         if include_metadata and unique_points:
             console.print("[cyan]Fetching point metadata...[/cyan]")
-            
+
             # Get site points to extract metadata
             all_points = []
             page = 1
@@ -442,11 +435,11 @@ def site_timeseries(
                     result = client.get_site_points(site_name, page=page, per_page=500)
                     items = result.get("items", [])
                     all_points.extend(items)
-                    
+
                     if page >= result.get("pages", 1):
                         break
                     page += 1
-            
+
             # Build metadata map
             for point in all_points:
                 if point.get("name") in unique_points:

{aceiot_models_cli-0.3.0 → aceiot_models_cli-0.3.2}/src/aceiot_models_cli/config.py

@@ -132,7 +132,7 @@ def init_config(api_key: str | None = None, api_url: str | None = None) -> None:
         )
 
     # Create config
-    config = Config(api_url=api_url, api_key=api_key)
+    config = Config(api_url=api_url or "https://flightdeck.aceiot.cloud/api", api_key=api_key)
 
     # Save config
     save_config(config)

{aceiot_models_cli-0.3.0 → aceiot_models_cli-0.3.2}/src/aceiot_models_cli/formatters.py

@@ -100,9 +100,10 @@ def truncate_string(text: str, max_length: int = 50, suffix: str = "...") -> str
 
 def format_size(size_bytes: int) -> str:
     """Format byte size as human-readable string."""
+    size = float(size_bytes)
     for unit in ["B", "KB", "MB", "GB", "TB"]:
-        if size_bytes < 1024.0:
-            return f"{size_bytes:.1f} {unit}"
-        size_bytes /= 1024.0
+        if size < 1024.0:
+            return f"{size:.1f} {unit}"
+        size /= 1024.0
 
-    return f"{size_bytes:.1f} PB"
+    return f"{size:.1f} PB"

{aceiot_models_cli-0.3.0 → aceiot_models_cli-0.3.2}/src/aceiot_models_cli/volttron_commands.py

@@ -127,7 +127,7 @@ def upload_agent(
     """Upload a Volttron agent package to a client.
 
     The package is uploaded to the specified client. If a gateway name is provided,
-    the client that owns that gateway will be used. Packages are shared across 
+    the client that owns that gateway will be used. Packages are shared across
     all gateways belonging to the same client.
 
     Directories are automatically compressed to tar.gz format before upload.
@@ -314,6 +314,9 @@ def create_config(
     if not name:
         name = file_path.stem
 
+    # Read configuration file
+    content = file_path.read_text()
+    
     # Validate configuration if requested
     if validate:
         console.print("Validating configuration...")
@@ -322,7 +325,6 @@ def create_config(
 
             import yaml
 
-            content = file_path.read_text()
             if file_path.suffix in ['.yaml', '.yml']:
                 yaml.safe_load(content)
             else:
@@ -467,7 +469,7 @@ def deploy(
             )
 
             config_name = "default"
-            config_data = None
+            config_data = ""  # Initialize as empty string
 
             if config_choice == "custom":
                 config_name = click.prompt("Configuration name")
@@ -572,6 +574,11 @@ def deploy(
 
     try:
         with console.status("Creating deployment...", spinner="dots"):
+            # Ensure we have at least volttron_agent data
+            if not volttron_agent_data:
+                print_error("Volttron agent data is required")
+                ctx.exit(1)
+                
             result = client.create_gateway_volttron_agent_config_package(
                 gateway,
                 volttron_agent=volttron_agent_data,

{aceiot_models_cli-0.3.0 → aceiot_models_cli-0.3.2}/tests/test_error_handling.py

@@ -43,6 +43,21 @@ class TestErrorHandling:
             status_code=404,
             response_data={"detail": "Gateway 'nonexistent-gateway' not found"}
         )
+        
+        # Since the code now falls back to treating it as a client name,
+        # we need to mock the client upload to also fail
+        mock_client.get_client.side_effect = APIError(
+            "API request failed",
+            status_code=404,
+            response_data={"detail": "Client 'nonexistent-gateway' not found"}
+        )
+        
+        # Or we can make the upload fail
+        mock_client.upload_client_volttron_agent_package.side_effect = APIError(
+            "API request failed",
+            status_code=404,
+            response_data={"detail": "Client 'nonexistent-gateway' not found"}
+        )
 
         runner = CliRunner()
         with runner.isolated_filesystem():
@@ -62,7 +77,8 @@ class TestErrorHandling:
             )
 
             assert result.exit_code == 1
-            assert "Failed to get gateway info: Gateway 'nonexistent-gateway' not found" in result.output
+            # The error message should now be about upload failure since it falls back to client
+            assert "Upload failed: Client 'nonexistent-gateway' not found" in result.output
 
     @patch('aceiot_models_cli.volttron_commands.require_api_client')
     def test_list_packages_client_not_found(self, mock_require_client):