Remove MCPServer/lib directory

artefactual · Oct 17, 2024 · 7de35a2 · 7de35a2
1 parent 8a61fe0
commit 7de35a2
Show file tree

Hide file tree

Showing 39 changed files with 10 additions and 11 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -6,7 +6,7 @@ repos:
     args: [--no-ensure-ascii, --autofix]
     files: |
       (?x)^(
-        src/MCPServer/lib/assets/.*\.json|
+        src/MCPServer/assets/.*\.json|
         src/(MCPClient/MCPServer|dashboard)/install/.*\.json
       )
 - repo: https://github.com/astral-sh/ruff-pre-commit

diff --git a/hack/Dockerfile b/hack/Dockerfile
@@ -241,9 +241,9 @@ ENTRYPOINT ["pyenv", "exec", "python3", "/src/src/MCPClient/archivematicaClient.
 FROM base AS archivematica-mcp-server
 
 ENV DJANGO_SETTINGS_MODULE=settings.common
-ENV PYTHONPATH=/src/src/MCPServer/lib/:/src/src/archivematicaCommon/lib/:/src/src/dashboard/
+ENV PYTHONPATH=/src/src/MCPServer/:/src/src/archivematicaCommon/lib/:/src/src/dashboard/
 
-ENTRYPOINT ["pyenv", "exec", "python3", "/src/src/MCPServer/lib/archivematicaMCP.py"]
+ENTRYPOINT ["pyenv", "exec", "python3", "/src/src/MCPServer/archivematicaMCP.py"]
 
 # -----------------------------------------------------------------------------
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -18,7 +18,7 @@ include = [
     "**/src/archivematicaCommon/lib/*",
     "**/src/dashboard/*",
     "**/src/MCPClient/*",
-    "**/src/MCPServer/lib/*",
+    "**/src/MCPServer/*",
 ]
 branch = true
 
@@ -124,8 +124,7 @@ legacy_tox_ini = """
         DASHBOARD_DIR = {env:SRC_DIR}/dashboard
         DASHBOARD_PYTHONPATH = {env:DASHBOARD_DIR}:{env:ARCHIVEMATICA_COMMON_DIR}
         # MCP Server
-        MCPSERVER_ROOT = {env:SRC_DIR}/MCPServer
-        MCPSERVER_DIR = {env:MCPSERVER_ROOT}/lib
+        MCPSERVER_DIR = {env:SRC_DIR}/MCPServer
         MCPSERVER_PYTHONPATH = {env:MCPSERVER_DIR}:{env:ARCHIVEMATICA_COMMON_DIR}:{env:DASHBOARD_DIR}
         # MCP Client
         MCPCLIENT_DIR = {env:SRC_DIR}/MCPClient

diff --git a/src/MCPServer/lib/archivematicaMCP.py → src/MCPServer/archivematicaMCP.py b/src/MCPServer/lib/archivematicaMCP.py → src/MCPServer/archivematicaMCP.py
diff --git a/...Server/lib/assets/workflow-schema-v1.json → src/MCPServer/assets/workflow-schema-v1.json b/...Server/lib/assets/workflow-schema-v1.json → src/MCPServer/assets/workflow-schema-v1.json
diff --git a/src/MCPServer/lib/assets/workflow.json → src/MCPServer/assets/workflow.json b/src/MCPServer/lib/assets/workflow.json → src/MCPServer/assets/workflow.json
diff --git a/src/MCPServer/lib/server/__init__.py → src/MCPServer/server/__init__.py b/src/MCPServer/lib/server/__init__.py → src/MCPServer/server/__init__.py
diff --git a/src/MCPServer/lib/server/jobs/__init__.py → src/MCPServer/server/jobs/__init__.py b/src/MCPServer/lib/server/jobs/__init__.py → src/MCPServer/server/jobs/__init__.py
diff --git a/src/MCPServer/lib/server/jobs/base.py → src/MCPServer/server/jobs/base.py b/src/MCPServer/lib/server/jobs/base.py → src/MCPServer/server/jobs/base.py
diff --git a/src/MCPServer/lib/server/jobs/chain.py → src/MCPServer/server/jobs/chain.py b/src/MCPServer/lib/server/jobs/chain.py → src/MCPServer/server/jobs/chain.py
diff --git a/src/MCPServer/lib/server/jobs/client.py → src/MCPServer/server/jobs/client.py b/src/MCPServer/lib/server/jobs/client.py → src/MCPServer/server/jobs/client.py
diff --git a/src/MCPServer/lib/server/jobs/decisions.py → src/MCPServer/server/jobs/decisions.py b/src/MCPServer/lib/server/jobs/decisions.py → src/MCPServer/server/jobs/decisions.py
diff --git a/src/MCPServer/lib/server/jobs/local.py → src/MCPServer/server/jobs/local.py b/src/MCPServer/lib/server/jobs/local.py → src/MCPServer/server/jobs/local.py
diff --git a/src/MCPServer/lib/server/mcp.py → src/MCPServer/server/mcp.py b/src/MCPServer/lib/server/mcp.py → src/MCPServer/server/mcp.py
diff --git a/src/MCPServer/lib/server/metrics.py → src/MCPServer/server/metrics.py b/src/MCPServer/lib/server/metrics.py → src/MCPServer/server/metrics.py
diff --git a/src/MCPServer/lib/server/packages.py → src/MCPServer/server/packages.py b/src/MCPServer/lib/server/packages.py → src/MCPServer/server/packages.py
diff --git a/...MCPServer/lib/server/processing_config.py → src/MCPServer/server/processing_config.py b/...MCPServer/lib/server/processing_config.py → src/MCPServer/server/processing_config.py
diff --git a/src/MCPServer/lib/server/queues.py → src/MCPServer/server/queues.py b/src/MCPServer/lib/server/queues.py → src/MCPServer/server/queues.py
diff --git a/src/MCPServer/lib/server/rpc_server.py → src/MCPServer/server/rpc_server.py b/src/MCPServer/lib/server/rpc_server.py → src/MCPServer/server/rpc_server.py
diff --git a/src/MCPServer/lib/server/shared_dirs.py → src/MCPServer/server/shared_dirs.py b/src/MCPServer/lib/server/shared_dirs.py → src/MCPServer/server/shared_dirs.py
diff --git a/src/MCPServer/lib/server/tasks/__init__.py → src/MCPServer/server/tasks/__init__.py b/src/MCPServer/lib/server/tasks/__init__.py → src/MCPServer/server/tasks/__init__.py
diff --git a/...ver/lib/server/tasks/backends/__init__.py → ...PServer/server/tasks/backends/__init__.py b/...ver/lib/server/tasks/backends/__init__.py → ...PServer/server/tasks/backends/__init__.py
diff --git a/...PServer/lib/server/tasks/backends/base.py → src/MCPServer/server/tasks/backends/base.py b/...PServer/lib/server/tasks/backends/base.py → src/MCPServer/server/tasks/backends/base.py
diff --git a/.../server/tasks/backends/gearman_backend.py → .../server/tasks/backends/gearman_backend.py b/.../server/tasks/backends/gearman_backend.py → .../server/tasks/backends/gearman_backend.py
diff --git a/src/MCPServer/lib/server/tasks/task.py → src/MCPServer/server/tasks/task.py b/src/MCPServer/lib/server/tasks/task.py → src/MCPServer/server/tasks/task.py
diff --git a/src/MCPServer/lib/server/translation.py → src/MCPServer/server/translation.py b/src/MCPServer/lib/server/translation.py → src/MCPServer/server/translation.py
diff --git a/src/MCPServer/lib/server/utils.py → src/MCPServer/server/utils.py b/src/MCPServer/lib/server/utils.py → src/MCPServer/server/utils.py
diff --git a/src/MCPServer/lib/server/watch_dirs.py → src/MCPServer/server/watch_dirs.py b/src/MCPServer/lib/server/watch_dirs.py → src/MCPServer/server/watch_dirs.py
diff --git a/src/MCPServer/lib/server/workflow.py → src/MCPServer/server/workflow.py b/src/MCPServer/lib/server/workflow.py → src/MCPServer/server/workflow.py
diff --git a/...CPServer/lib/server/workflow_abilities.py → src/MCPServer/server/workflow_abilities.py b/...CPServer/lib/server/workflow_abilities.py → src/MCPServer/server/workflow_abilities.py
diff --git a/src/MCPServer/lib/settings/__init__.py → src/MCPServer/settings/__init__.py b/src/MCPServer/lib/settings/__init__.py → src/MCPServer/settings/__init__.py
diff --git a/src/MCPServer/lib/settings/common.py → src/MCPServer/settings/common.py b/src/MCPServer/lib/settings/common.py → src/MCPServer/settings/common.py
diff --git a/src/MCPServer/lib/settings/test.py → src/MCPServer/settings/test.py b/src/MCPServer/lib/settings/test.py → src/MCPServer/settings/test.py
diff --git a/src/MCPServer/lib/settings/testmysql.py → src/MCPServer/settings/testmysql.py b/src/MCPServer/lib/settings/testmysql.py → src/MCPServer/settings/testmysql.py
diff --git a/src/archivematicaCommon/lib/appconfig.py b/src/archivematicaCommon/lib/appconfig.py
@@ -2,7 +2,7 @@
 Configuration helper for MCPServer, MCPClient and Dashboard, used in:
 
     - MCPClient/settings/common.py
-    - MCPServer/lib/settings/common.py
+    - MCPServer/settings/common.py
     - dashboard/settings/base.py
 
 Config. attributes are declared on those settings files and they can be defined

diff --git a/tests/MCPServer/test_processing_config.py b/tests/MCPServer/test_processing_config.py
@@ -12,7 +12,7 @@
 from server.workflow import load
 
 ASSETS_DIR = (
-    pathlib.Path(__file__).parent.parent.parent / "src" / "MCPServer" / "lib" / "assets"
+    pathlib.Path(__file__).parent.parent.parent / "src" / "MCPServer" / "assets"
 )
 
 

diff --git a/tests/MCPServer/test_rpc_server.py b/tests/MCPServer/test_rpc_server.py
@@ -9,7 +9,7 @@
 from server import workflow
 
 ASSETS_DIR = (
-    pathlib.Path(__file__).parent.parent.parent / "src" / "MCPServer" / "lib" / "assets"
+    pathlib.Path(__file__).parent.parent.parent / "src" / "MCPServer" / "assets"
 )
 
 

diff --git a/tests/MCPServer/test_workflow.py b/tests/MCPServer/test_workflow.py
@@ -8,7 +8,7 @@
 from server import workflow
 
 ASSETS_DIR = (
-    pathlib.Path(__file__).parent.parent.parent / "src" / "MCPServer" / "lib" / "assets"
+    pathlib.Path(__file__).parent.parent.parent / "src" / "MCPServer" / "assets"
 )
 FIXTURES_DIR = pathlib.Path(__file__).parent / "fixtures"
 

diff --git a/tests/MCPServer/test_workflow_abilities.py b/tests/MCPServer/test_workflow_abilities.py
@@ -6,7 +6,7 @@
 from server.workflow_abilities import choice_is_available
 
 ASSETS_DIR = (
-    pathlib.Path(__file__).parent.parent.parent / "src" / "MCPServer" / "lib" / "assets"
+    pathlib.Path(__file__).parent.parent.parent / "src" / "MCPServer" / "assets"
 )