Merge pull request #36 from DefangLabs/jordan/devex

Developer experience improvements

Author: jordanstephens

.gitignore

@@ -1,3 +1,5 @@
+__pycache__
+sentence-transformers
 myenv/
 .tmp/*
 !.tmp/prebuild.sh

app/Dockerfile

@@ -39,11 +39,11 @@ COPY . /app
 # Make the prebuild.sh script executable
 RUN chmod +x .tmp/prebuild.sh
 
-# Expose port 5000 for the Flask application
-EXPOSE 5000
+# Expose port 5050 for the Flask application
+EXPOSE 5050
 
 # Define environment variable for Flask
 ENV FLASK_APP=app.py
 
 # Run the application using uWSGI
-CMD ["uwsgi", "--http", "0.0.0.0:5000", "--wsgi-file", "app.py", "--callable", "app", "--processes", "4", "--threads", "2"]
+CMD ["uwsgi", "--http", "0.0.0.0:5050", "--wsgi-file", "app.py", "--callable", "app", "--processes", "4", "--threads", "2"]

app/app.py

@@ -40,7 +40,7 @@ def ask():
 
     if not query:
         return jsonify({"error": "No query provided"}), 400
-    
+
     # For analytics tracking, generates an anonymous id and uses it for the session
     if 'anonymous_id' not in session:
         session['anonymous_id'] = str(uuid.uuid4())
@@ -59,12 +59,13 @@ def generate():
         if not full_response:
             full_response = "No response generated"
 
-        # Track the query and response 
-        analytics.track(
-            anonymous_id=anonymous_id, 
-            event='Chatbot Question submitted', 
-            properties={'query': query, 'response': full_response, 'source': 'Ask Defang'}
-        )
+        if analytics.write_key:
+            # Track the query and response
+            analytics.track(
+                anonymous_id=anonymous_id,
+                event='Chatbot Question submitted',
+                properties={'query': query, 'response': full_response, 'source': 'Ask Defang'}
+            )
 
     return Response(stream_with_context(generate()), content_type='text/markdown')
 
@@ -98,4 +99,4 @@ def trigger_rebuild():
         return jsonify({"error": "Internal Server Error"}), 500
 
 if __name__ == '__main__':
-    app.run(host='0.0.0.0', port=5000)
+    app.run(host='0.0.0.0', port=5050)

app/requirements.txt

@@ -4,7 +4,7 @@ Werkzeug==2.0.3
 scikit-learn==0.24.2
 segment-analytics-python==2.3.3
 numpy==1.22.0
-sentence-transformers==2.1.0
+sentence-transformers==2.2.1
 torch==1.10.0
 huggingface_hub==0.8.1
 openai==0.28.0

compose.dev.yaml

@@ -4,8 +4,8 @@ services:
       context: ./app
       shm_size: "16gb"
     ports:
-      - target: 5000
-        published: 5001 # MacOS AirPlay uses port 5000
+      - target: 5050
+        published: 5050 # MacOS AirPlay uses port 5000
         protocol: tcp
         mode: ingress
     environment:
@@ -14,7 +14,12 @@ services:
       SEGMENT_WRITE_KEY: ${SEGMENT_WRITE_KEY} # Set your Segment write key here or in the .env file
       SESSION_COOKIE_SECURE: 0
       OPENAI_API_KEY: ${OPENAI_API_KEY} # Set your OpenAI API key here or in the .env file
-    command: flask run --host=0.0.0.0
+      SENTENCE_TRANSFORMERS_HOME: /app/sentence-transformers
+    volumes:
+      - type: bind
+        source: ./app
+        target: /app
+    command: flask run --host=0.0.0.0 --port=5050
     deploy:
       resources:
         reservations:

compose.yaml

@@ -7,8 +7,8 @@ services:
       context: ./app
       shm_size: "16gb"
     ports:
-      - target: 5000
-        published: 5000
+      - target: 5050
+        published: 5050
         protocol: tcp
         mode: ingress
     environment:
@@ -17,13 +17,13 @@ services:
       SEGMENT_WRITE_KEY: 
       SESSION_COOKIE_SECURE: 1
       OPENAI_API_KEY: ${OPENAI_API_KEY} # Set your OpenAI API key here or in the .env file
-    command: uwsgi --http 0.0.0.0:5000 --wsgi-file app.py --callable app --processes 4 --threads 2
+    command: uwsgi --http 0.0.0.0:5050 --wsgi-file app.py --callable app --processes 4 --threads 2
     deploy:
       resources:
         reservations:
           memory: 4G
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:5000/"]
+      test: ["CMD", "curl", "-f", "http://localhost:5050/"]
       interval: 30s
       timeout: 10s
       retries: 5