Merge pull request #47 from DigitalProductInnovationAndDevelopment/feat/switch-pipenv

Switch to pipenv

Author: ishworgiri1999

.github/workflows/docker.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        app: [api, queue, dashboard]
+        app: [recommender, dashboard]
 
     steps:
       - name: Checkout repository
@@ -37,7 +37,7 @@ jobs:
 
       - name: GET DockerFile Path
         run: |
-          DOCKERFILE_PATH=$(if [ "${{ matrix.app }}" == "dashboard" ]; then echo "./dashboard/Dockerfile"; else echo "Dockerfile.${{ matrix.app }}"; fi)
+          DOCKERFILE_PATH=$(if [ "${{ matrix.app }}" == "dashboard" ]; then echo "./dashboard/Dockerfile"; else echo "Dockerfile.base"; fi)
           echo "DOCKERFILE_PATH=$DOCKERFILE_PATH" >> $GITHUB_ENV
       - name: Build and push Docker image
         uses: docker/build-push-action@v5

.github/workflows/test.yml

@@ -22,10 +22,10 @@ jobs:
 
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
-          pip install -r requirements.txt
-          pip install pytest
+          pip install pipenv
+          pipenv install
+          pipenv install --dev
 
       - name: Run tests
         run: |
-          make test
+          pipenv run make test

.gitignore

@@ -12,7 +12,7 @@
 # CVE Search plugin data
 
 .cve_search_data/
-.docs
+.docs/
 .idea
 .DS_Store
 

Dockerfile.api

@@ -1,17 +1,23 @@
+#DEPRECATED
+
 FROM python:3.11
 
+# Set the working directory in the container to /app
+COPY Pipfile  /app/
+COPY Pipfile.lock /app/
+# install pipenv
+RUN pip install pipenv
+
+RUN pipenv install --system --deploy
+
 # Set the working directory in the container to /app
 WORKDIR /app
 
 # Add the current directory contents into the container at /app
 ADD . /app
 
-# Install any needed packages specified in requirements.txt
-RUN pip install -r requirements.txt
 
-#install uvicorn
-RUN pip install uvicorn
 # Make port 8000 available to the world outside this container
 EXPOSE 8000
 
-CMD ["/bin/bash", "-c", "cd src && uvicorn app:app --host 0.0.0.0 --port 8000"]
+CMD ["/bin/bash", "-c", "make db-migrate && cd src && uvicorn app:app --host 0.0.0.0 --port 8000"]

Dockerfile.queue Dockerfile.base

@@ -3,14 +3,24 @@ FROM python:3.11
 # Set the working directory in the container to /app
 WORKDIR /app
 
+
+COPY Pipfile  /app/
+COPY Pipfile.lock /app/
+# install pipenv
+RUN pip install pipenv
+
+RUN pipenv install --system --deploy
+
+
 # Add the current directory contents into the container at /app
 ADD . /app
 
-# Install any needed packages specified in requirements.txt
-RUN pip install -r requirements.txt
 
 
 # Make port 8000 available to the world outside this container
 EXPOSE 8000
 
-CMD ["/bin/bash", "-c", "cd src && celery -A worker.worker worker --loglevel=info --concurrency 1"]
+
+
+
+# CMD ["/bin/bash", "-c", "cd src && celery -A worker.worker worker --loglevel=info --concurrency 1"]

Makefile

@@ -22,12 +22,23 @@ db-migrate-down-base:
 	cd src && alembic downgrade base
 
 
+docker-nuke:
+	. ./scripts/nuke.sh
+
 dev:
 	cd src && uvicorn app:app --host 0.0.0.0 --port 8001 --reload 
 
 
+start:
+	cd src && uvicorn app:app --host 0.0.0.0 --port 8000 --reload 
+
+
 test:
 	cd src && pytest
 
+
+docs:
+	cd src && python3 extract-docs.py
+
 start-worker:
 	cd src && celery -A worker.worker worker --loglevel=info --concurrency 1

Pipfile

@@ -0,0 +1,35 @@
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+pydantic = "*"
+pandas = "*"
+sqlmodel = "~=0.0.18"
+alembic = "~=1.13.1"
+psycopg = "*"
+psycopg-binary = "*"
+fastapi = "==0.109.1"
+uvicorn = "==0.15.0"
+python-dotenv = "*"
+jsonschema = "==4.22.0"
+sqlalchemy = "~=2.0.30"
+tqdm = "~=4.66.4"
+httpx = "~=0.27.0"
+tenacity = "~=8.3.0"
+celery = {extras = ["redis"], version = "==5.2.2"}
+openai = "~=1.33.0"
+anthropic = "~=0.28.0"
+pydantic-settings = "~=2.3.2"
+sentence-transformers = "*"
+kneed = "*"
+scikit-learn = "*"
+plotly = "*"
+
+[dev-packages]
+mypy = "*"
+pytest = "*"
+
+[requires]
+python_version = "3.11"