Keep both the Kivy UI and Web API

This reverts commit 6e09a03.

Author: mihow

poetry.lock

@@ -31,6 +31,12 @@ torch = "^2.1.0"
 torchvision = "^0.16.0"
 timm = "^0.6.13"
 structlog = "^22.3.0"
+kivy = { extras = ["base"], version = "^2.1.0" }
+plyer = "^2.1.0"
+pyobjus = [
+    { version = "^1.2.1", platform = "darwin" },
+    { version = "^1.2.1", platform = "linux" },
+]
 
 # [tool.poetry.group.dev.dependencies] # Can't install these dev deps with pip, so they're in the main deps
 black = "^23.3.0"
@@ -54,6 +60,8 @@ asyncio_mode = 'auto'
 profile = "black"
 
 [tool.poetry.scripts]
+trapdata = 'trapdata.ui.main:run'
+trapdata-test = 'trapdata.tests.test_pipeline:process_deployments'
 ami = 'trapdata.cli.base:cli'
 
 # [tool.setuptools.package_data]

pyproject.toml

@@ -3,7 +3,7 @@
 
 import typer
 
-from trapdata.cli import export, queue, settings, shell, show, test
+from trapdata.cli import db, export, queue, settings, shell, show, test
 from trapdata.db.base import get_session_class
 from trapdata.db.models.events import get_or_create_monitoring_sessions
 from trapdata.db.models.queue import add_monitoring_session_to_queue
@@ -14,11 +14,22 @@
 cli.add_typer(shell.cli, name="shell", help="Open an interactive shell")
 cli.add_typer(test.cli, name="test", help="Run tests")
 cli.add_typer(show.cli, name="show", help="Show data for use in other commands")
+cli.add_typer(db.cli, name="db", help="Create, update and manage the database")
 cli.add_typer(
     queue.cli, name="queue", help="Add and manage images in the processing queue"
 )
 
 
+@cli.command()
+def gui():
+    """
+    Launch graphic interface
+    """
+    from trapdata.ui.main import run
+
+    run()
+
+
 @cli.command("import")
 def import_data(image_base_path: Optional[pathlib.Path] = None, queue: bool = True):
     """

trapdata/cli/base.py

@@ -0,0 +1,48 @@
+import typer
+from trapdata import db
+from trapdata.cli import settings
+
+cli = typer.Typer(no_args_is_help=True)
+
+
+@cli.command()
+def create():
+    """
+    Create database tables and sqlite file if neccessary.
+    """
+    db.create_db(settings.database_url)
+    db.migrate(settings.database_url)
+    db.check_db(settings.database_url, quiet=False)
+
+
+@cli.command()
+def update():
+    """
+    Run database migrations to update the database schema.
+    """
+    db.migrate(settings.database_url)
+    db.check_db(settings.database_url, quiet=False)
+
+
+@cli.command()
+def reset():
+    """
+    Backup and recreate database tables.
+    """
+    reset = typer.confirm("Are you sure you want to reset the database?")
+    if reset:
+        db.reset_db(settings.database_url)
+    else:
+        typer.Abort()
+
+
+@cli.command()
+def check():
+    """
+    Validate database tables and ORM models.
+    """
+    db.check_db(settings.database_url, quiet=False)
+
+
+if __name__ == "__main__":
+    cli()

trapdata/cli/db.py

@@ -1,3 +1,4 @@
+import configparser
 import pathlib
 import sys
 from functools import lru_cache
@@ -167,6 +168,7 @@ def customise_sources(  # UK spelling
             return (
                 init_settings,
                 env_settings,
+                kivy_settings_source,
                 file_secret_settings,
             )
 
@@ -175,10 +177,39 @@ class PipelineSettings(Settings):
     image_base_path: FilePath  # Override default settings to enforce image_base_path
 
 
-cli_help_message = """
+def kivy_settings_path() -> pathlib.Path:
+    project_root = pathlib.Path(__file__).parent
+    kivy_settings_path = project_root / "ui" / "trapdata.ini"
+    return kivy_settings_path
+
+
+def kivy_settings_source(settings: BaseSettings) -> dict[str, str]:
+    """
+    Load settings set by user in the Kivy GUI app.
+    """
+    path = kivy_settings_path()
+    if not path.exists():
+        return {}
+    else:
+        config = configparser.ConfigParser()
+        config.read(kivy_settings_path())
+        kivy_settings = [config.items(section) for section in config.sections()]
+        kivy_settings_flat = dict(
+            [item for section in kivy_settings for item in section]
+        )
+        null_values = ["None"]
+        kivy_settings_flat = {
+            k: v for k, v in kivy_settings_flat.items() if v not in null_values
+        }
+        return kivy_settings_flat
+
+
+cli_help_message = f"""
     Configuration for the CLI is currently set in the following sources, in order of priority:
         - The system environment (os.environ)
         - ".env" file (see ".env.example"), prefix settings with "AMI_"
+        - Kivy settings panel in the GUI app
+        - Directly in the Kivy settings file: {kivy_settings_path()}
     """