From c7eda49769cdc34c6dd09dca2206ec3511b37ea4 Mon Sep 17 00:00:00 2001
From: space <space@reversed.dev>
Date: Sun, 24 May 2026 12:46:40 +0200
Subject: [PATCH] Move code directly into backend and cli src

---
 README.md                                         | 2 +-
 backend/README.md                                 | 4 ++--
 backend/pyproject.toml                            | 8 +++++++-
 backend/{whisper_remote_backend => src}/server.py | 0
 backend/tests/test_server.py                      | 5 ++++-
 backend/whisper_remote_backend/__init__.py        | 1 -
 cli/README.md                                     | 2 +-
 cli/pyproject.toml                                | 8 +++++++-
 cli/{whisper_remote_cli => src}/main.py           | 0
 cli/tests/test_main.py                            | 5 ++++-
 cli/whisper_remote_cli/__init__.py                | 1 -
 11 files changed, 26 insertions(+), 10 deletions(-)
 rename backend/{whisper_remote_backend => src}/server.py (100%)
 delete mode 100644 backend/whisper_remote_backend/__init__.py
 rename cli/{whisper_remote_cli => src}/main.py (100%)
 delete mode 100644 cli/whisper_remote_cli/__init__.py

diff --git a/README.md b/README.md
index fc5d902..ad99fce 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ The repo also includes a Gitea Actions workflow at `.gitea/workflows/ci.yml` tha
 ```bash
 cd backend
 pip install -e .
-uvicorn whisper_remote_backend.server:app --host 0.0.0.0 --port 8000
+uvicorn server:app --app-dir src --host 0.0.0.0 --port 8000
 ```
 
 The backend machine must already have the upstream `whisper` CLI available on `PATH`.
diff --git a/backend/README.md b/backend/README.md
index 4f1ef14..db32de8 100644
--- a/backend/README.md
+++ b/backend/README.md
@@ -2,13 +2,13 @@
 
 FastAPI wrapper around the upstream `whisper` CLI from `openai/whisper`.
 
-Package layout is flat in this folder: `whisper_remote_backend/server.py`.
+Package layout is flat in this folder: `src/server.py`.
 
 ## Run
 
 ```bash
 pip install -e .
-uvicorn whisper_remote_backend.server:app --host 0.0.0.0 --port 8000
+uvicorn server:app --app-dir src --host 0.0.0.0 --port 8000
 ```
 
 ## API
diff --git a/backend/pyproject.toml b/backend/pyproject.toml
index de51e81..18ddbf8 100644
--- a/backend/pyproject.toml
+++ b/backend/pyproject.toml
@@ -15,10 +15,16 @@ dependencies = [
 ]
 
 [project.scripts]
-whisper-remote-server = "whisper_remote_backend.server:main"
+whisper-remote-server = "server:main"
 
 [project.optional-dependencies]
 dev = [
   "httpx>=0.28.0,<1.0.0",
   "pytest>=8.3.0,<9.0.0",
 ]
+
+[tool.setuptools]
+py-modules = ["server"]
+
+[tool.setuptools.package-dir]
+"" = "src"
diff --git a/backend/whisper_remote_backend/server.py b/backend/src/server.py
similarity index 100%
rename from backend/whisper_remote_backend/server.py
rename to backend/src/server.py
diff --git a/backend/tests/test_server.py b/backend/tests/test_server.py
index d28fdff..59baf5d 100644
--- a/backend/tests/test_server.py
+++ b/backend/tests/test_server.py
@@ -1,8 +1,11 @@
 from pathlib import Path
+import sys
+
+sys.path.insert(0, str(Path(__file__).resolve().parents[1] / "src"))
 
 from fastapi.testclient import TestClient
 
-from whisper_remote_backend import server
+import server
 
 
 client = TestClient(server.app)
diff --git a/backend/whisper_remote_backend/__init__.py b/backend/whisper_remote_backend/__init__.py
deleted file mode 100644
index 5ca4deb..0000000
--- a/backend/whisper_remote_backend/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""whisper-remote backend package."""
diff --git a/cli/README.md b/cli/README.md
index ea8549a..b604636 100644
--- a/cli/README.md
+++ b/cli/README.md
@@ -2,7 +2,7 @@
 
 Local CLI that forwards media files to a remote `whisper-remote-backend` server.
 
-Package layout is flat in this folder: `whisper_remote_cli/main.py`.
+Package layout is flat in this folder: `src/main.py`.
 
 ## Run
 
diff --git a/cli/pyproject.toml b/cli/pyproject.toml
index fb3fe04..33975b5 100644
--- a/cli/pyproject.toml
+++ b/cli/pyproject.toml
@@ -18,4 +18,10 @@ dev = [
 ]
 
 [project.scripts]
-whisper-remote = "whisper_remote_cli.main:main"
+whisper-remote = "main:main"
+
+[tool.setuptools]
+py-modules = ["main"]
+
+[tool.setuptools.package-dir]
+"" = "src"
diff --git a/cli/whisper_remote_cli/main.py b/cli/src/main.py
similarity index 100%
rename from cli/whisper_remote_cli/main.py
rename to cli/src/main.py
diff --git a/cli/tests/test_main.py b/cli/tests/test_main.py
index 180642a..a77e9ab 100644
--- a/cli/tests/test_main.py
+++ b/cli/tests/test_main.py
@@ -1,10 +1,13 @@
 import os
 from argparse import Namespace
 from pathlib import Path
+import sys
 
 import pytest
 
-from whisper_remote_cli import main
+sys.path.insert(0, str(Path(__file__).resolve().parents[1] / "src"))
+
+import main
 
 
 def test_resolve_server_from_env(monkeypatch) -> None:
diff --git a/cli/whisper_remote_cli/__init__.py b/cli/whisper_remote_cli/__init__.py
deleted file mode 100644
index 0608698..0000000
--- a/cli/whisper_remote_cli/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""whisper-remote CLI package."""