python v1 - working list, download issue

Dockerfile

@@ -15,13 +15,18 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 
 # Copy and install Python dependencies
 COPY requirements.txt .
-RUN pip install --no-cache-dir -r requirements.txt
+RUN pip install --no-cache-dir --upgrade pip && \
+    pip install --no-cache-dir -r requirements.txt
 
 # Copy application code
-COPY . .
+COPY garminsync/ ./garminsync/
+
+# Create data directory
+RUN mkdir -p /app/data
 
 # Set environment variables from .env file
 ENV ENV_FILE=/app/.env
+ENV DATA_DIR=/app/data
 
 # Set the entrypoint to run the CLI
 ENTRYPOINT ["python", "-m", "garminsync.cli"]

garminsync/cli.py

@@ -1,29 +1,30 @@
+import os
 import typer
+from typing_extensions import Annotated
 from .config import load_config
 
 # Initialize environment variables
 load_config()
 
-app = typer.Typer()
+app = typer.Typer(help="GarminSync - Download Garmin Connect activities", rich_markup_mode=None)
 
-@app.command(name="list")
+@app.command("list")
 def list_activities(
-    all: bool = typer.Option(False, "--all", help="List all activities"),
+    all_activities: Annotated[bool, typer.Option("--all", help="List all activities")] = False,
-    missing: bool = typer.Option(False, "--missing", help="List missing activities"),
+    missing: Annotated[bool, typer.Option("--missing", help="List missing activities")] = False,
-    downloaded: bool = typer.Option(False, "--downloaded", help="List downloaded activities")
+    downloaded: Annotated[bool, typer.Option("--downloaded", help="List downloaded activities")] = False
 ):
-    """
+    """List activities based on specified filters"""
-    List activities based on specified filters
-    """
     from tqdm import tqdm
     from .database import get_session, Activity
     from .garmin import GarminClient
     
     # Validate input
-    if not any([all, missing, downloaded]):
+    if not any([all_activities, missing, downloaded]):
         typer.echo("Error: Please specify at least one filter option (--all, --missing, --downloaded)")
         raise typer.Exit(code=1)
     
+    try:
         client = GarminClient()
         session = get_session()
         
@@ -35,7 +36,7 @@ def list_activities(
         # Build query based on filters
         query = session.query(Activity)
         
-    if all:
+        if all_activities:
             pass  # Return all activities
         elif missing:
             query = query.filter_by(downloaded=False)
@@ -54,13 +55,18 @@ def list_activities(
             status = "Downloaded" if activity.downloaded else "Missing"
             typer.echo(f"- ID: {activity.activity_id}, Start: {activity.start_time}, Status: {status}")
             
-@app.command()
+    except Exception as e:
+        typer.echo(f"Error: {str(e)}")
+        raise typer.Exit(code=1)
+    finally:
+        if 'session' in locals():
+            session.close()
+
+@app.command("download")
 def download(
-    missing: bool = typer.Option(False, "--missing", help="Download missing activities")
+    missing: Annotated[bool, typer.Option("--missing", help="Download missing activities")] = False
 ):
-    """
+    """Download activities based on specified filters"""
-    Download activities based on specified filters
-    """
     from tqdm import tqdm
     from pathlib import Path
     from .database import get_session, Activity
@@ -71,6 +77,7 @@ def download(
         typer.echo("Error: Currently only --missing downloads are supported")
         raise typer.Exit(code=1)
     
+    try:
         client = GarminClient()
         session = get_session()
         
@@ -116,5 +123,15 @@ def download(
         
         typer.echo("Download completed successfully")
         
-if __name__ == "__main__":
+    except Exception as e:
+        typer.echo(f"Error: {str(e)}")
+        raise typer.Exit(code=1)
+    finally:
+        if 'session' in locals():
+            session.close()
+
+def main():
     app()
+
+if __name__ == "__main__":
+    main()

requirements.txt

@@ -1,4 +1,5 @@
-typer>=0.12.3,<0.13.0
+typer==0.9.0
+click==8.1.7
 python-dotenv==1.0.0
 garminconnect==0.2.28
 sqlalchemy==2.0.23