Merge pull request #1557 from swirlai/ds-3894-comm

unpin spacy in requirements; update Dockerfile for that change

Author: erikspears

Dockerfile

@@ -19,12 +19,25 @@ COPY ./db.sqlite3.dist /app/db.sqlite3
 COPY ./.env.docker /app/.env
 COPY ./download-nltk-resources.sh /app/
 
+# Near the top or just before WORKDIR
+ENV BLIS_ARCH=generic
+
 WORKDIR /app
 
-# Optimize pip and Python installations
-RUN pip install --no-cache-dir --upgrade pip \
-    && pip install --no-cache-dir -r requirements.txt \
-    && pip install --no-cache-dir --upgrade grpcio
+# Optimize pip and Python installations; install spaCy version matching requirements.txt
+RUN pip install --no-cache-dir --upgrade pip setuptools wheel && \
+    SPACY_VERSION=$(grep -E '^[sS]pacy(==|>=)' requirements.txt | head -1 | sed -E 's/^[sS]pacy(==|>=)//') && \
+    if [ -n "$SPACY_VERSION" ]; then \
+      echo "Found spaCy version $SPACY_VERSION in requirements.txt"; \
+      pip install --no-cache-dir --only-binary :all: spacy==$SPACY_VERSION || \
+      pip install --no-cache-dir spacy==$SPACY_VERSION; \
+    else \
+      echo "No pinned spaCy version found in requirements.txt, installing latest spaCy wheel"; \
+      pip install --no-cache-dir --only-binary :all: spacy || \
+      pip install --no-cache-dir spacy; \
+    fi && \
+    pip install --no-cache-dir -r requirements.txt && \
+    pip install --no-cache-dir --upgrade grpcio
 
 # Swirl install requirements
 RUN python -m spacy download en_core_web_lg && \

requirements.txt

@@ -2,15 +2,15 @@ requests
 Django>=5.1
 django_restframework
 django-celery-beat
-Celery>=5.5.0rc4
+Celery>=5.5.0rc5
 pika
 elasticsearch
 jsonpath-ng
 pyyaml
 whitenoise
 daphne
 textblob
-spacy==3.7.5
+spacy
 natsort
 django-environ
 statistics

swirl/banner.py

@@ -10,9 +10,9 @@ class bcolors:
     ENDC = '\033[0m'
     BOLD = '\033[1m'
 
-SWIRL_VERSION = '4.1-DEV'
+SWIRL_VERSION = '4.2-DEV'
 
-SWIRL_BANNER_TEXT = "__S_W_I_R_L__A_I__4_._1-DEV__________________________________________________________"
+SWIRL_BANNER_TEXT = "__S_W_I_R_L__A_I__4_._2-DEV__________________________________________________________"
 SWIRL_BANNER = f'{bcolors.BOLD}{SWIRL_BANNER_TEXT}{bcolors.ENDC}'
 
 #############################################