Remove duplicate files

Author: johnsamuelwrites

.github/workflows/ci.yml

@@ -37,15 +37,16 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
+          pip install -e ..
           pip install -e ".[dev]"
 
       - name: Lint with ruff
         run: |
-          ruff check shexstatements api --output-format=github
+          ruff check api --output-format=github
 
       - name: Type check with mypy
         run: |
-          mypy shexstatements api --ignore-missing-imports
+          mypy api --ignore-missing-imports
         continue-on-error: true
 
       - name: Run tests with pytest
@@ -143,7 +144,7 @@ jobs:
       - name: Build backend image
         uses: docker/build-push-action@v5
         with:
-          context: ./backend
+          context: .
           file: ./backend/Dockerfile
           push: false
           tags: shexstatements-backend:test

.github/workflows/release-pypi.yml

@@ -13,10 +13,6 @@ jobs:
     name: Build distribution
     runs-on: ubuntu-latest
 
-    defaults:
-      run:
-        working-directory: backend
-
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -41,7 +37,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: python-package-distributions
-          path: backend/dist/
+          path: dist/
 
   publish-to-pypi:
     name: Publish to PyPI

backend/Dockerfile

@@ -13,14 +13,18 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 # Create non-root user for security
 RUN useradd --create-home --shell /bin/bash appuser
 
-# Copy project files
-COPY pyproject.toml .
+# Install shared shexstatements package from repository root
+COPY setup.py README.md requirements.txt ./
 COPY shexstatements/ ./shexstatements/
-COPY api/ ./api/
+RUN pip install --no-cache-dir .
 
-# Install the application and dependencies
-RUN pip install --no-cache-dir -e . && \
-    apt-get purge -y gcc && \
+# Install backend API package
+COPY backend/pyproject.toml ./backend/pyproject.toml
+COPY backend/api/ ./backend/api/
+RUN pip install --no-cache-dir -e ./backend --no-deps
+
+# Clean build dependencies
+RUN apt-get purge -y gcc && \
     apt-get autoremove -y && \
     rm -rf /var/lib/apt/lists/*
 

backend/pyproject.toml

@@ -5,7 +5,7 @@
 #
 
 [project]
-name = "shexstatements"
+name = "shexstatements-backend"
 version = "1.0.0"
 description = "Tool to generate Shape Expressions from CSV files and spreadsheets"
 requires-python = ">=3.12"
@@ -37,6 +37,7 @@ classifiers = [
 ]
 
 dependencies = [
+    "shexstatements>=0.7",
     "fastapi>=0.109.0",
     "uvicorn[standard]>=0.27.0",
     "python-multipart>=0.0.6",
@@ -65,7 +66,6 @@ docs = [
 ]
 
 [project.scripts]
-shexstatements = "shexstatements.cliargs:main"
 shexstatements-api = "api.main:run_server"
 
 [project.urls]
@@ -79,7 +79,7 @@ requires = ["hatchling"]
 build-backend = "hatchling.build"
 
 [tool.hatch.build.targets.wheel]
-packages = ["shexstatements", "api"]
+packages = ["api"]
 
 [tool.pytest.ini_options]
 testpaths = ["tests"]