Merge branch 'main' into linda-test-chatbot

Author: commit111

.gitignore

@@ -1,3 +1,5 @@
 .env
+__pycache__
+sentence-transformers
 .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

@@ -9,7 +9,7 @@
 
 analytics.write_key = os.getenv('SEGMENT_WRITE_KEY')
 
-app = Flask(__name__, static_folder='templates/images')
+app = Flask(__name__, static_folder='templates/static')
 app.config['SECRET_KEY'] = os.getenv('SECRET_KEY')
 app.config['SESSION_COOKIE_HTTPONLY'] = True
 app.config['SESSION_COOKIE_SECURE'] = bool(os.getenv('SESSION_COOKIE_SECURE'))
@@ -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')
 
@@ -107,5 +108,4 @@ def debug_context():
         context = rag_system.get_context(query)
         return jsonify({"context": context})
 
-if __name__ == '__main__':
-    app.run(host='0.0.0.0', port=5000, static_url_path='/static')
+    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