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

aceiot_models_cli-0.4.0/.github/workflows/release.yml

@@ -0,0 +1,87 @@
+name: Release
+
+on:
+  release:
+    types: [published]
+  workflow_dispatch:
+    inputs:
+      dry_run:
+        description: 'Dry run (do not publish)'
+        required: false
+        default: true
+        type: boolean
+
+jobs:
+  test-matrix:
+    name: Test Python ${{ matrix.python-version }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+      matrix:
+        # NOTE: Currently only testing on Python 3.13 because aceiot-models 0.2.7
+        # requires Python>=3.13. Once aceiot-models is updated to support Python 3.10+,
+        # we can re-enable testing on: ["3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.13"]
+
+    steps:
+    - uses: actions/checkout@v4
+    
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python-version }}
+    
+    - name: Install uv
+      uses: astral-sh/setup-uv@v4
+    
+    - name: Install dependencies
+      run: |
+        uv pip install --system -e ".[dev]"
+    
+    - name: Run tests
+      run: |
+        uv run pytest tests -v
+
+  build-and-publish:
+    name: Build and Publish
+    needs: test-matrix
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
+    
+    steps:
+    - uses: actions/checkout@v4
+    
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.13'
+    
+    - name: Install uv
+      uses: astral-sh/setup-uv@v4
+    
+    - name: Build package
+      run: |
+        uv build
+    
+    - name: Check package
+      run: |
+        uv pip install --system twine
+        twine check dist/*
+    
+    - name: List distribution files
+      run: |
+        ls -la dist/
+    
+    - name: Publish to PyPI
+      if: github.event_name == 'release' || (github.event_name == 'workflow_dispatch' && !inputs.dry_run)
+      uses: pypa/gh-action-pypi-publish@release/v1
+      with:
+        verbose: true
+    
+    - name: Dry run notification
+      if: github.event_name == 'workflow_dispatch' && inputs.dry_run
+      run: |
+        echo "This was a dry run. Package was built but not published."
+        echo "To publish, run the workflow again with dry_run set to false."

aceiot_models_cli-0.4.0/.github/workflows/tests.yml

@@ -0,0 +1,123 @@
+name: Tests
+
+on:
+  push:
+    branches: [ main, develop ]
+  pull_request:
+    branches: [ main, develop ]
+  workflow_dispatch:
+
+jobs:
+  test:
+    name: Test Python ${{ matrix.python-version }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
+
+    steps:
+    - uses: actions/checkout@v4
+    
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python-version }}
+    
+    - name: Install uv
+      uses: astral-sh/setup-uv@v4
+      with:
+        enable-cache: true
+        cache-dependency-glob: |
+          pyproject.toml
+          requirements*.txt
+    
+    - name: Install dependencies
+      run: |
+        uv pip install --system -e ".[dev]"
+    
+    - name: Run tests with pytest
+      run: |
+        uv run pytest tests -v --cov=aceiot_models_cli --cov-report=term-missing --cov-report=xml
+    
+    - name: Upload coverage to Codecov
+      if: matrix.python-version == '3.13'
+      uses: codecov/codecov-action@v4
+      with:
+        file: ./coverage.xml
+        fail_ci_if_error: false
+        verbose: true
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    
+    steps:
+    - uses: actions/checkout@v4
+    
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.13'
+    
+    - name: Install uv
+      uses: astral-sh/setup-uv@v4
+    
+    - name: Install dependencies
+      run: |
+        uv pip install --system ruff
+    
+    - name: Run ruff check
+      run: |
+        uv run ruff check src tests
+    
+    - name: Run ruff format check
+      run: |
+        uv run ruff format --check src tests
+
+  type-check:
+    name: Type Check
+    runs-on: ubuntu-latest
+    
+    steps:
+    - uses: actions/checkout@v4
+    
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.13'
+    
+    - name: Install uv
+      uses: astral-sh/setup-uv@v4
+    
+    - name: Install dependencies
+      run: |
+        uv pip install --system -e ".[dev]"
+        uv pip install --system pyright
+    
+    - name: Run pyright
+      run: |
+        uv run pyright src
+
+  tox:
+    name: Tox Test Suite
+    runs-on: ubuntu-latest
+    
+    steps:
+    - uses: actions/checkout@v4
+    
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.13'
+    
+    - name: Install uv
+      uses: astral-sh/setup-uv@v4
+    
+    - name: Install tox and tox-uv
+      run: |
+        uv pip install --system tox tox-uv
+    
+    - name: Run tox
+      run: |
+        uv run tox

{aceiot_models_cli-0.3.2 → aceiot_models_cli-0.4.0}/.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -13,15 +13,22 @@ repos:
       - id: mixed-line-ending
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.0
+    rev: v0.8.7
     hooks:
       - id: ruff
         args: [--fix]
       - id: ruff-format
 
-  - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.10.0
+  - repo: https://github.com/RobertCraigie/pyright-python
+    rev: v1.1.401
     hooks:
-      - id: mypy
-        additional_dependencies: [types-requests, types-pyyaml]
+      - id: pyright
+        language_version: python3.10
+        additional_dependencies: 
+          - aceiot-models>=0.2.4
+          - click>=8.2.1
+          - requests>=2.31.0
+          - rich>=13.7.0
+          - pyyaml>=6.0.1
+          - pandas>=2.0.0
         exclude: ^tests/

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

@@ -5,6 +5,33 @@ 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).
 
+## [Unreleased]
+
+## [0.4.0] - 2025-07-26
+
+### Added
+- Full Python 3.10+ support now that aceiot-models 0.3.3 supports it
+- Multi-version Python testing infrastructure with tox (3.10, 3.11, 3.12, 3.13)
+- GitHub Actions CI/CD workflow for automated testing across all Python versions
+- Pre-commit hooks for code quality checks
+- CONTRIBUTING.md with development and testing guidelines
+- Automated release workflow with testing
+
+### Changed
+- Updated requires-python from >=3.13 to >=3.10
+- Fixed datetime.UTC usage for Python 3.10 compatibility (using timezone.utc)
+- Updated development dependencies to include tox and pre-commit
+- Enhanced CI/CD pipeline infrastructure for multi-version testing
+- Updated aceiot-models dependency to 0.3.3
+
+### Fixed
+- Removed local path override for aceiot-models dependency
+- Fixed CI/CD workflows to use uv run for all commands
+- Updated test to match new APIClient._request method name
+- Resolved variable shadowing in deploy function
+- Fixed missing Any import in volttron_commands
+- Resolved all pyright type checking errors
+
 ## [0.3.2] - 2025-07-26
 
 ### Changed

aceiot_models_cli-0.4.0/CONTRIBUTING.md

@@ -0,0 +1,133 @@
+# Contributing to ACE IoT Models CLI
+
+We welcome contributions to the ACE IoT Models CLI! This document provides guidelines for contributing to the project.
+
+## Development Setup
+
+### Prerequisites
+
+- Python 3.10 or higher
+- [uv](https://github.com/astral-sh/uv) (recommended) or pip
+
+### Setting up your development environment
+
+1. Clone the repository:
+```bash
+git clone https://github.com/ACE-IoT-Solutions/aceiot-models-cli.git
+cd aceiot-models-cli
+```
+
+2. Install the package in development mode with dev dependencies:
+```bash
+# Using uv (recommended)
+uv pip install -e ".[dev]"
+
+# Or using pip
+pip install -e ".[dev]"
+```
+
+## Testing
+
+We test against multiple Python versions to ensure compatibility. All code must pass tests on Python 3.10, 3.11, 3.12, and 3.13.
+
+### Running tests locally
+
+#### Using pytest directly:
+```bash
+# Run all tests
+pytest
+
+# Run with coverage
+pytest --cov=aceiot_models_cli --cov-report=term-missing
+
+# Run specific test file
+pytest tests/test_cli.py
+
+# Run with verbose output
+pytest -v
+```
+
+#### Using tox for multi-version testing:
+```bash
+# Install tox if not already installed
+uv pip install tox tox-uv
+
+# Run tests on all Python versions
+tox
+
+# Run tests on specific Python version
+tox -e py310
+
+# Run only linting
+tox -e lint
+
+# Run only type checking
+tox -e type
+
+# Run formatting
+tox -e format
+```
+
+### Code Quality
+
+Before submitting a pull request, ensure your code meets our quality standards:
+
+1. **Formatting**: Code must be formatted with ruff
+```bash
+ruff format src tests
+```
+
+2. **Linting**: Code must pass ruff checks
+```bash
+ruff check src tests
+```
+
+3. **Type Checking**: Code must pass pyright type checks
+```bash
+pyright src
+```
+
+4. **Tests**: All tests must pass
+```bash
+pytest
+```
+
+You can run all checks at once using tox:
+```bash
+tox
+```
+
+## Pull Request Process
+
+1. Fork the repository and create your branch from `main`
+2. Make your changes and add tests for new functionality
+3. Ensure all tests pass on all supported Python versions
+4. Update documentation as needed
+5. Submit a pull request with a clear description of your changes
+
+### CI/CD
+
+Our GitHub Actions workflow will automatically:
+- Run tests on Python 3.10, 3.11, 3.12, and 3.13
+- Check code formatting with ruff
+- Run type checking with pyright
+- Generate coverage reports
+
+All checks must pass before a PR can be merged.
+
+## Release Process
+
+Releases are managed through GitHub releases and automatically published to PyPI. Only maintainers can create releases.
+
+### Creating a Release
+
+1. Update version in `pyproject.toml`
+2. Update `CHANGELOG.md` with release notes
+3. Commit changes: `git commit -m "chore: bump version to X.Y.Z"`
+4. Create and push tag: `git tag vX.Y.Z && git push origin vX.Y.Z`
+5. Create GitHub release
+6. GitHub Actions will automatically run tests and publish to PyPI
+
+## Questions?
+
+If you have questions, please open an issue on GitHub.

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aceiot-models-cli
-Version: 0.3.2
+Version: 0.4.0
 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
@@ -13,11 +13,14 @@ Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.13
-Requires-Dist: aceiot-models>=0.2.4
+Requires-Python: >=3.10
+Requires-Dist: aceiot-models==0.3.3
 Requires-Dist: click-repl>=0.3.0
 Requires-Dist: click>=8.2.1
 Requires-Dist: email-validator>=2.1.0
@@ -34,6 +37,11 @@ Description-Content-Type: text/markdown
 
 A command-line interface for interacting with the ACE IoT API using the `aceiot-models` package. This CLI provides comprehensive access to ACE IoT's fleet management capabilities for IoT devices, sites, and data points.
 
+## Requirements
+
+- Python 3.10 or higher
+- An ACE IoT API key
+
 ## Features
 
 - Complete CLI for ACE IoT API operations

{aceiot_models_cli-0.3.2 → aceiot_models_cli-0.4.0}/README.md

@@ -2,6 +2,11 @@
 
 A command-line interface for interacting with the ACE IoT API using the `aceiot-models` package. This CLI provides comprehensive access to ACE IoT's fleet management capabilities for IoT devices, sites, and data points.
 
+## Requirements
+
+- Python 3.10 or higher
+- An ACE IoT API key
+
 ## Features
 
 - Complete CLI for ACE IoT API operations

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

@@ -1,6 +1,6 @@
 [project]
 name = "aceiot-models-cli"
-version = "0.3.2"
+version = "0.4.0"
 description = "Command-line interface for ACE IoT Aerodrome API using aceiot-models package"
 readme = "README.md"
 authors = [
@@ -12,14 +12,17 @@ classifiers = [
     "Intended Audience :: Developers",
     "License :: OSI Approved :: MIT License",
     "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
 ]
 keywords = ["aceiot", "iot", "api", "cli", "bacnet"]
-requires-python = ">=3.13"
+requires-python = ">=3.10"
 dependencies = [
-    "aceiot-models>=0.2.4",
+    "aceiot-models==0.3.3",
     "click>=8.2.1",
     "requests>=2.31.0",
     "requests-toolbelt>=1.0.0",
@@ -50,11 +53,14 @@ dev = [
     "pytest>=8.4.1",
     "pytest-cov>=6.0.0",
     "ruff>=0.12.4",
+    "tox>=4.0.0",
+    "tox-uv>=1.0.0",
+    "pre-commit>=3.0.0",
 ]
 
 [tool.ruff]
 line-length = 100
-target-version = "py313"
+target-version = "py310"
 fix = true
 
 [tool.ruff.lint]
@@ -89,11 +95,19 @@ addopts = [
 ]
 
 [tool.mypy]
-python_version = "3.13"
+python_version = "3.10"
 warn_return_any = true
 warn_unused_configs = true
 disallow_untyped_defs = true
 strict_optional = true
 
-[tool.uv.sources]
-aceiot-models = { path = "../aceiot-models" }
+[tool.pyright]
+pythonVersion = "3.10"
+typeCheckingMode = "basic"
+exclude = [
+    "**/test_serializers.py",
+    "tests/**",
+]
+
+# [tool.uv.sources]
+# aceiot-models = { path = "../aceiot-models" }  # For local development only

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

@@ -180,6 +180,7 @@ def create_client(
 
         # Convert model to dict for API
         from aceiot_models.serializers import serialize_for_api
+
         client_dict = serialize_for_api(client_data)
         result = client.create_client(client_dict)
         print_success(f"Client '{name}' created successfully")
@@ -222,11 +223,7 @@ def list_sites(
         # Handle client_name filtering differently
         if client_name:
             # Use get_client_sites for specific client
-            result = client.get_client_sites(
-                client_name=client_name,
-                page=page,
-                per_page=per_page
-            )
+            result = client.get_client_sites(client_name=client_name, page=page, per_page=per_page)
         else:
             # Get all sites
             result = client.get_sites(
@@ -317,8 +314,13 @@ def get_site(ctx: Context, site_name: str) -> None:
 @click.option("--start", required=True, help="Start time (ISO format, e.g., 2024-01-01T00:00:00Z)")
 @click.option("--end", required=True, help="End time (ISO format, e.g., 2024-01-02T00:00:00Z)")
 @click.option("--output-file", "-o", help="Output file path (defaults to <site>-<start>-<end>.csv)")
-@click.option("--format", "-f", type=click.Choice(["csv", "parquet", "auto"]), default="auto",
-              help="Output format (auto detects from file extension, defaults to csv)")
+@click.option(
+    "--format",
+    "-f",
+    type=click.Choice(["csv", "parquet", "auto"]),
+    default="auto",
+    help="Output format (auto detects from file extension, defaults to csv)",
+)
 @click.option("--include-metadata", is_flag=True, help="Include point metadata in output")
 @click.pass_context
 def site_timeseries(
@@ -371,8 +373,8 @@ def site_timeseries(
             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('+', '_')
+        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"
@@ -391,7 +393,7 @@ def site_timeseries(
             format = "csv"
             # Add .csv extension if missing
             if not output_path.suffix:
-                output_path = output_path.with_suffix('.csv')
+                output_path = output_path.with_suffix(".csv")
                 output_file = str(output_path)
 
     # Ensure output_path is always a Path object
@@ -400,15 +402,17 @@ def site_timeseries(
     try:
         # Validate time format
         try:
-            datetime.fromisoformat(start.replace('Z', '+00:00'))
-            datetime.fromisoformat(end.replace('Z', '+00:00'))
+            datetime.fromisoformat(start.replace("Z", "+00:00"))
+            datetime.fromisoformat(end.replace("Z", "+00:00"))
         except ValueError as e:
             print_error(f"Invalid time format: {e}")
             print_error("Use ISO format, e.g., 2024-01-01T00:00:00Z")
             ctx.exit(1)
 
         # Fetch timeseries data directly using site endpoint
-        console.print(f"[cyan]Fetching timeseries data for site '{site_name}' from {start} to {end}...[/cyan]")
+        console.print(
+            f"[cyan]Fetching timeseries data for site '{site_name}' from {start} to {end}...[/cyan]"
+        )
 
         with console.status("Loading data...", spinner="dots"):
             response = client.get_site_timeseries(site_name, start, end)
@@ -420,7 +424,9 @@ 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]")
+        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 = {}
@@ -466,13 +472,15 @@ def site_timeseries(
             # Add metadata if requested
             if include_metadata and sample.get("name") in point_metadata:
                 metadata = point_metadata[sample.get("name")]
-                row.update({
-                    "point_id": metadata["id"],
-                    "site": metadata["site"],
-                    "point_type": metadata["point_type"],
-                    "unit": metadata["unit"],
-                    "description": metadata["description"],
-                })
+                row.update(
+                    {
+                        "point_id": metadata["id"],
+                        "site": metadata["site"],
+                        "point_type": metadata["point_type"],
+                        "unit": metadata["unit"],
+                        "description": metadata["description"],
+                    }
+                )
 
             df_data.append(row)
 
@@ -496,7 +504,9 @@ def site_timeseries(
             df.to_parquet(output_path, index=False, engine="pyarrow")
 
         # Summary
-        console.print(f"\n[green]✓ Successfully exported {len(df)} rows to {output_path.name}[/green]")
+        console.print(
+            f"\n[green]✓ Successfully exported {len(df)} rows to {output_path.name}[/green]"
+        )
         console.print(f"  Full path: {output_path.absolute()}")
         console.print(f"  Time range: {df['timestamp'].min()} to {df['timestamp'].max()}")
         console.print(f"  Unique points: {df['point_name'].nunique()}")
@@ -668,8 +678,7 @@ def list_discovered_points(ctx: Context, site_name: str, page: int, per_page: in
             # Convert Point objects back to dicts for JSON output
             json_result = result.copy()  # Keep original structure
             json_result["items"] = [
-                point.model_dump() if isinstance(point, Point) else point
-                for point in points
+                point.model_dump() if isinstance(point, Point) else point for point in points
             ]
             click.echo(format_json(json_result))
         else:
@@ -895,6 +904,7 @@ def repl_mode(ctx: Context) -> None:
 # Add the volttron command group to the CLI
 cli.add_command(volttron)
 
+
 # Entry point
 def main() -> None:
     """Main entry point for the CLI."""

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

@@ -118,7 +118,9 @@ def init_config(api_key: str | None = None, api_url: str | None = None) -> None:
     config_path = get_default_config_path()
 
     # Check if config already exists
-    if config_path.exists() and not click.confirm(f"Config file already exists at {config_path}. Overwrite?"):
+    if config_path.exists() and not click.confirm(
+        f"Config file already exists at {config_path}. Overwrite?"
+    ):
         return
 
     # Get values from user if not provided