fixed /subscribe

Author: rabbit0021

.github/workflows/ci-cd.yml

@@ -59,6 +59,15 @@ jobs:
 
     - name: Deploy to AKS
       run: |
-        kubectl set image deployment/my-app-deployment \
+        kubectl set env deployment/my-app-deployment \
+          FLASK_ENV=${{ vars.FLASK_ENV }} \
+          TMPDIR=${{ vars.TMPDIR }} \
+          DB_TYPE=${{ vars.DB_TYPE }} \
+          DB_PATH=${{ vars.DB_PATH }} \
+          SECRET_KEY=${{ secrets.SECRET_KEY }}
+          HF_HOME=${{ vars.HF_HOME }}
+          SMTP_USERNAME=${{ secrets.SMTP_USERNAME }}
+          SMTP_PASSWORD=${{ secrets.SMTP_PASSWORD }}
+        kubectl set image deployment/onesearchserver \
           my-app=${{ secrets.ACR_NAME }}.azurecr.io/${{ vars.DOCKER_IMAGE_NAME }}:${{ github.sha }}
-        kubectl rollout status deployment/my-app-deployment
+        kubectl rollout status deployment/onesearchserver

app.py

@@ -50,27 +50,37 @@ def subscribe():
     if not email or not topic or (not techteams and not individuals and not communities):
         return jsonify({"status": "error", "message": "Missing email or topic or publisher"
                         }), 400
-    conn = app.db.get_connection()
-    
-    if techteams:
-        techteams = [team.lower().strip() for team in techteams.split(',')]
+    try:
+        conn = app.db.get_connection()
 
-        for team in techteams:
-            publishers = app.db.get_publisher_by_name(conn, team)
-            if not publishers:
-                return jsonify({"status": "error", "message": f"Publisher '{team}' not found."
-                                }), 404
-            
-            publisher = publishers[0]
+        if techteams:
+            techteams = [team.lower().strip() for team in techteams.split(',')]
 
-            existing_subscriptions = app.db.get_subscriptions_by_email(conn, email)
-            if not any(sub["publisher"]["id"] == publisher["id"] and sub["topic"] == topic for sub in existing_subscriptions):
-                app.db.add_subscription(conn, email, topic, publisher['id'])
-
-    return jsonify({
-        "status": "success",
-        "message": "Subscription updated."
-    })
+            for team in techteams:
+                publishers = app.db.get_publisher_by_name(conn, team)
+                if not publishers:
+                    return jsonify({"status": "error", "message": f"Publisher '{team}' not found."
+                                    }), 404
+                
+                publisher = publishers[0]
+                
+                existing_subscriptions = app.db.get_subscriptions_by_email(conn, email)
+                if not any(sub["publisher"]["id"] == publisher["id"] and sub["topic"] == topic for sub in existing_subscriptions):
+                    app.db.add_subscription(conn, email, topic, publisher['id'])
+        
+        conn.commit()
+        return jsonify({
+            "status": "success",
+            "message": "Subscription updated."
+        })
+    except:
+        conn.rollback()
+        return jsonify({
+            "status": "failed",
+            "message": "Unable to add Subscription at this time, Could you please try again."
+         }, 500)
+    finally:
+        conn.close()
 
 @app.route("/subscriptions_for_email")
 def subscriptions_for_email():
@@ -85,7 +95,7 @@ def subscriptions_for_email():
     grouped = {}
     for entry in subscriptions:
         topic = entry["topic"]
-        publisher = entry["publisher"]["name"]
+        publisher = entry["publisher"]["publisher_name"]
         if topic not in grouped:
             grouped[topic] = set()
         grouped[topic].add(publisher)

requirements.txt

@@ -24,6 +24,7 @@ httpcore==1.0.9
 httpx==0.28.1
 huggingface-hub==0.34.4
 idna==3.10
+iniconfig==2.1.0
 itsdangerous==2.2.0
 Jinja2==3.1.6
 jiter==0.10.0
@@ -39,14 +40,17 @@ mpmath==1.3.0
 namex==0.1.0
 networkx==3.5
 numpy==2.3.2
+openai==1.99.9
 opt_einsum==3.4.0
 optree==0.17.0
 packaging==25.0
 pillow==11.3.0
+pluggy==1.6.0
 protobuf==6.32.0
 pydantic==2.11.7
 pydantic_core==2.33.2
 Pygments==2.19.2
+pytest==8.4.1
 python-dateutil==2.9.0.post0
 PyYAML==6.0.2
 regex==2025.7.34

static/script2.js

@@ -65,7 +65,7 @@ form.addEventListener("submit", function (e) {
             companyInput.disabled = true; // show
 
         } else {
-            alert("Subscription failed.");
+            alert(result.message);
         }
     });
 });