k (#2721)

Merge hotfix/v0.8-supervisord-logs into release/v0.8

backend/Dockerfile

@@ -101,7 +101,7 @@ COPY ./scripts/force_delete_connector_by_id.py /app/scripts/force_delete_connect
 # Put logo in assets
 COPY ./assets /app/assets
 
-ENV PYTHONPATH /app
+ENV PYTHONPATH=/app
 
 # Default command which does nothing
 # This container is used by api server and background which specify their own CMD

backend/Dockerfile.model_server

@@ -55,6 +55,6 @@ COPY ./shared_configs /app/shared_configs
 # Model Server main code
 COPY ./model_server /app/model_server
 
-ENV PYTHONPATH /app
+ENV PYTHONPATH=/app
 
 CMD ["uvicorn", "model_server.main:app", "--host", "0.0.0.0", "--port", "9000"]

backend/supervisord.conf

@@ -7,12 +7,13 @@ logfile=/var/log/supervisord.log
 # Cannot place this in Celery for now because Celery must run as a single process (see note below)
 # Indexing uses multi-processing to speed things up
 [program:document_indexing]
-environment=CURRENT_PROCESS_IS_AN_INDEXING_JOB=true,LOG_FILE_NAME=document_indexing
+environment=CURRENT_PROCESS_IS_AN_INDEXING_JOB=true
 command=python danswer/background/update.py
+stdout_logfile=/var/log/document_indexing.log
+stdout_logfile_maxbytes=16MB
 redirect_stderr=true
 autorestart=true
 
-
 # Background jobs that must be run async due to long time to completion
 # NOTE: due to an issue with Celery + SQLAlchemy 
 # (https://github.com/celery/celery/issues/7007#issuecomment-1740139367)
@@ -87,7 +88,8 @@ stopasgroup=true
 # More details on setup here: https://docs.danswer.dev/slack_bot_setup
 [program:slack_bot]
 command=python danswer/danswerbot/slack/listener.py
-environment=LOG_FILE_NAME=slack_bot
+stdout_logfile=/var/log/slack_bot.log
+stdout_logfile_maxbytes=16MB
 redirect_stderr=true
 autorestart=true
 startretries=5
@@ -101,8 +103,8 @@ command=tail -qF
     /var/log/celery_worker_primary.log
     /var/log/celery_worker_light.log
     /var/log/celery_worker_heavy.log
-    /var/log/document_indexing_info.log
-    /var/log/slack_bot_debug.log
+    /var/log/document_indexing.log
+    /var/log/slack_bot.log
 stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes = 0  # must be set to 0 when stdout_logfile=/dev/stdout
 autorestart=true

backend/tests/integration/Dockerfile

@@ -81,6 +81,6 @@ RUN pip install --no-cache-dir --upgrade \
         -r /tmp/dev-requirements.txt
 COPY ./tests/integration /app/tests/integration
 
-ENV PYTHONPATH /app
+ENV PYTHONPATH=/app
 
 CMD ["pytest", "-s", "/app/tests/integration"]

web/Dockerfile

@@ -25,10 +25,10 @@ COPY . .
 RUN npm ci
 
 # needed to get the `standalone` dir we expect later
-ENV NEXT_PRIVATE_STANDALONE true
+ENV NEXT_PRIVATE_STANDALONE=true
 
 # Disable automatic telemetry collection
-ENV NEXT_TELEMETRY_DISABLED 1
+ENV NEXT_TELEMETRY_DISABLED=1
 
 # Environment variables must be present at build time
 # https://github.com/vercel/next.js/discussions/14030
@@ -77,7 +77,7 @@ RUN rm -rf /usr/local/lib/node_modules
 # ENV NODE_ENV production  
 
 # Disable automatic telemetry collection
-ENV NEXT_TELEMETRY_DISABLED 1
+ENV NEXT_TELEMETRY_DISABLED=1
 
 # Don't run production as root
 RUN addgroup --system --gid 1001 nodejs

web/src/app/admin/assistants/PersonaTable.tsx

@@ -175,7 +175,7 @@ export function PersonasTable({
               </div>,
               <div key="edit" className="flex">
                 <div className="mr-auto my-auto">
-                  {!persona.is_default_persona && isEditable ? (
+                  {!persona.builtin_persona && isEditable ? (
                     <div
                       className="hover:bg-hover rounded p-1 cursor-pointer"
                       onClick={async () => {

web/src/components/IsPublicGroupSelector.tsx

@@ -49,7 +49,7 @@ export const IsPublicGroupSelector = <T extends IsPublicGroupSelectorFormType>({
         setShouldHideContent(false);
       }
     }
-  }, [user, userGroups, formikProps, isPaidEnterpriseFeaturesEnabled]);
+  }, [user, userGroups, isPaidEnterpriseFeaturesEnabled]);
 
   if (isLoadingUser || userGroupsIsLoading) {
     return <div>Loading...</div>;