No Zulip or Web Connector

.github/workflows/docker-build-push-backend-container-on-tag.yml

@@ -30,13 +30,13 @@ jobs:
         platforms: linux/amd64,linux/arm64
         push: true
         tags: |
-          danswer/danswer-backend:${{ github.ref_name }}
-          danswer/danswer-backend:latest
+          danswer/danswer-backend-no-zulip:${{ github.ref_name }}
+          danswer/danswer-backend-no-zulip:latest
         build-args: |
           DANSWER_VERSION=${{ github.ref_name }}
 
     - name: Run Trivy vulnerability scanner
       uses: aquasecurity/trivy-action@master
       with:
-        image-ref: docker.io/danswer/danswer-backend:${{ github.ref_name }}
+        image-ref: docker.io/danswer/danswer-backend-no-zulip:${{ github.ref_name }}
         severity: 'CRITICAL,HIGH'

.github/workflows/docker-tag-latest.yml

@@ -29,4 +29,4 @@ jobs:
 
     - name: Pull, Tag and Push API Server Image
       run: |
-        docker buildx imagetools create -t danswer/danswer-backend:latest danswer/danswer-backend:${{ github.event.inputs.version }}
+        docker buildx imagetools create -t danswer/danswer-backend-no-zulip:latest danswer/danswer-backend-no-zulip:${{ github.event.inputs.version }}

backend/Dockerfile

@@ -29,7 +29,7 @@ RUN pip install --no-cache-dir --upgrade -r /tmp/requirements.txt && \
 # xserver-common and xvfb included by playwright installation but not needed after
 # perl-base is part of the base Python Debian image but not needed for Danswer functionality
 # perl-base could only be removed with --allow-remove-essential
-RUN apt-get remove -y --allow-remove-essential perl-base xserver-common xvfb cmake libldap-2.5-0 libldap-2.5-0 && \
+RUN apt-get remove -y --allow-remove-essential perl-base xserver-common xvfb cmake libldap-2.5-0 libldap-2.5-0 libnss3 && \
     apt-get autoremove -y && \
     rm -rf /var/lib/apt/lists/* && \
     rm /usr/local/lib/python3.11/site-packages/tornado/test/test.key

backend/danswer/connectors/zulip/connector.py

@@ -5,8 +5,6 @@ from typing import Any
 from typing import List
 from typing import Tuple
 
-from zulip import Client
-
 from danswer.configs.app_configs import INDEX_BATCH_SIZE
 from danswer.configs.constants import DocumentSource
 from danswer.connectors.interfaces import GenerateDocumentsOutput
@@ -30,6 +28,23 @@ from danswer.utils.logger import setup_logger
 logger = setup_logger()
 
 
+class DummyZulipClient:
+    """Due to certain container security scan not distinguishing Zulip client/server and mismarking
+    Zulip client as having a server only vulnerability this branch has zulip disabled"""
+
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        raise RuntimeError("Zulip client library not installed.")
+
+
+try:
+    from zulip import Client  # type:ignore
+except ImportError:
+    logger.warning(
+        "Zulip is not installed on this branch, please check out Danswer main to use Zulip"
+    )
+    Client = DummyZulipClient  # type:ignore
+
+
 class ZulipConnector(LoadConnector, PollConnector):
     def __init__(
         self, realm_name: str, realm_url: str, batch_size: int = INDEX_BATCH_SIZE

backend/requirements/default.txt

@@ -69,6 +69,5 @@ torch==2.0.1
 torchvision==0.15.2
 transformers==4.36.2
 uvicorn==0.21.1
-zulip==0.8.2
 hubspot-api-client==8.1.0
 zenpy==2.0.41

deployment/docker_compose/docker-compose.dev.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   api_server:
-    image: danswer/danswer-backend:latest
+    image: danswer/danswer-backend-no-zulip:latest
     build:
       context: ../../backend
       dockerfile: Dockerfile
@@ -82,7 +82,7 @@ services:
         max-size: "50m"
         max-file: "6"
   background:
-    image: danswer/danswer-backend:latest
+    image: danswer/danswer-backend-no-zulip:latest
     build:
       context: ../../backend
       dockerfile: Dockerfile

deployment/docker_compose/docker-compose.prod-no-letsencrypt.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   api_server:
-    image: danswer/danswer-backend:latest
+    image: danswer/danswer-backend-no-zulip:latest
     build:
       context: ../../backend
       dockerfile: Dockerfile
@@ -31,7 +31,7 @@ services:
         max-size: "50m"
         max-file: "6"
   background:
-    image: danswer/danswer-backend:latest
+    image: danswer/danswer-backend-no-zulip:latest
     build:
       context: ../../backend
       dockerfile: Dockerfile

deployment/docker_compose/docker-compose.prod.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   api_server:
-    image: danswer/danswer-backend:latest
+    image: danswer/danswer-backend-no-zulip:latest
     build:
       context: ../../backend
       dockerfile: Dockerfile
@@ -31,7 +31,7 @@ services:
         max-size: "50m"
         max-file: "6"
   background:
-    image: danswer/danswer-backend:latest
+    image: danswer/danswer-backend-no-zulip:latest
     build:
       context: ../../backend
       dockerfile: Dockerfile

deployment/kubernetes/api_server-service-deployment.yaml

@@ -28,7 +28,7 @@ spec:
     spec:
       containers:
       - name: api-server
-        image: danswer/danswer-backend:latest
+        image: danswer/danswer-backend-no-zulip:latest
         imagePullPolicy: IfNotPresent
         command:
           - "/bin/sh"

deployment/kubernetes/background-deployment.yaml

@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: background
-        image: danswer/danswer-backend:latest
+        image: danswer/danswer-backend-no-zulip:latest
         imagePullPolicy: IfNotPresent
         command: ["/usr/bin/supervisord"]
         # There are some extra values since this is shared between services