save changes to insert sources in patent summary

Author: taichan03

docker-compose.yml

@@ -1,34 +1,34 @@
 services:
   db:
-      build:
-        context: ./db
-        dockerfile: Dockerfile
-      volumes:
-        - postgres_data:/var/lib/postgresql/data/
-      environment:
-        - POSTGRES_USER=balancer
-        - POSTGRES_PASSWORD=balancer
-        - POSTGRES_DB=balancer_dev
-      ports:
-      - "5433:5432"
-      networks:
-        app_net:
-          ipv4_address: 192.168.0.2  
-  pgadmin:
-    container_name: pgadmin4
-    image: dpage/pgadmin4
+    build:
+      context: ./db
+      dockerfile: Dockerfile
+    volumes:
+      - postgres_data:/var/lib/postgresql/data/
     environment:
-      PGADMIN_DEFAULT_EMAIL: [email protected]
-      PGADMIN_DEFAULT_PASSWORD: balancer
-      # PGADMIN_LISTEN_PORT = 80
-    # volumes:
-    #   - ./pgadmin-data:/var/lib/pgadmin
-    #       # PGADMIN_LISTEN_PORT = 80
+      - POSTGRES_USER=balancer
+      - POSTGRES_PASSWORD=balancer
+      - POSTGRES_DB=balancer_dev
     ports:
-      - "5050:80"
+      - "5433:5432"
     networks:
       app_net:
-        ipv4_address: 192.168.0.4
+        ipv4_address: 192.168.0.2
+  # pgadmin:
+  #   container_name: pgadmin4
+  #   image: dpage/pgadmin4
+  #   environment:
+  #     PGADMIN_DEFAULT_EMAIL: [email protected]
+  #     PGADMIN_DEFAULT_PASSWORD: balancer
+  #     # PGADMIN_LISTEN_PORT = 80
+  #   # volumes:
+  #   #   - ./pgadmin-data:/var/lib/pgadmin
+  #   #       # PGADMIN_LISTEN_PORT = 80
+  #   ports:
+  #     - "5050:80"
+  #   networks:
+  #     app_net:
+  #       ipv4_address: 192.168.0.4
   backend:
     image: balancer-backend
     build: ./server
@@ -52,13 +52,13 @@ services:
       args:
         - IMAGE_NAME=balancer-frontend
     ports:
-        - "3000:3000"
+      - "3000:3000"
     environment:
-        - CHOKIDAR_USEPOLLING=true
-        # - VITE_API_BASE_URL=https://balancertestsite.com/
+      - CHOKIDAR_USEPOLLING=true
+      # - VITE_API_BASE_URL=https://balancertestsite.com/
     volumes:
-        - "./frontend:/usr/src/app:delegated"
-        - "/usr/src/app/node_modules/"
+      - "./frontend:/usr/src/app:delegated"
+      - "/usr/src/app/node_modules/"
     depends_on:
       - backend
     networks:
@@ -72,4 +72,4 @@ networks:
       driver: default
       config:
         - subnet: "192.168.0.0/24"
-          gateway: 192.168.0.1
+          gateway: 192.168.0.1

frontend/src/api/apiClient.ts

@@ -67,7 +67,7 @@ const handleRuleExtraction = async (guid: string) => {
   }
 };
 
-const fetchRiskDataWithSources = async (medication: string, source: "include" | "diagnosis" = "include") => {
+const fetchRiskDataWithSources = async (medication: string, source: "include" | "diagnosis" | "diagnosis_depressed" = "include") => {
   try {
     const response = await api.post(`/v1/api/riskWithSources`, {
       drug: medication,

frontend/src/pages/PatientManager/PatientSummary.tsx

@@ -304,7 +304,16 @@ const PatientSummary = ({
     setLoading(true);
 
     try {
-      const data = await fetchRiskDataWithSources(medication, source);
+      // Map source based on patient's diagnosis
+      let apiSource: "include" | "diagnosis" | "diagnosis_depressed" = source;
+      if (source === "diagnosis" && patientInfo.Diagnosis === "Depressed") {
+        apiSource = "diagnosis_depressed";
+      }
+
+      const data = await fetchRiskDataWithSources(medication, apiSource);
+      console.log("Risk data received for", medication, "with source", apiSource, ":", data);
+      console.log("Sources array:", data.sources);
+      console.log("Sources length:", data.sources?.length);
       setRiskData(data as RiskData);
     } catch (error) {
       console.error("Error fetching risk data: ", error);
@@ -331,7 +340,13 @@ const PatientSummary = ({
     setLoading(true);
 
     try {
-      const data = await fetchRiskDataWithSources(medication, source);
+      // Map source based on patient's diagnosis
+      let apiSource: "include" | "diagnosis" | "diagnosis_depressed" = source;
+      if (source === "diagnosis" && patientInfo.Diagnosis === "Depressed") {
+        apiSource = "diagnosis_depressed";
+      }
+
+      const data = await fetchRiskDataWithSources(medication, apiSource);
       setRiskData(data as RiskData);
     } catch (error) {
       console.error("Error fetching risk data: ", error);

server/api/migrations/0014_alter_medrule_rule_type.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.3 on 2025-10-25 16:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0013_medrule_medications'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='medrule',
+            name='rule_type',
+            field=models.CharField(choices=[('INCLUDE', 'Include'), ('EXCLUDE', 'Exclude')], max_length=500),
+        ),
+    ]

server/api/models/model_medRule.py

@@ -8,7 +8,7 @@ class MedRule(models.Model):
         ('INCLUDE', 'Include'),
         ('EXCLUDE', 'Exclude'),
     ]
-    rule_type = models.CharField(max_length=7, choices=RULE_TYPE_CHOICES)
+    rule_type = models.CharField(max_length=500, choices=RULE_TYPE_CHOICES)
     history_type = models.CharField(max_length=255)
     reason = models.TextField(blank=True, null=True)
     label = models.CharField(max_length=255, blank=True, null=True)

server/api/views/embeddings/embeddingsView.py

@@ -90,7 +90,7 @@ def stream_generator():
             return Response({
                 "question": message,
                 "llm_response": answer,
-                "embeddings_info": embeddings_results,
+                "embeddings_info": listOfEmbeddings,
                 "sent_to_llm": prompt_text,
             }, status=status.HTTP_200_OK)
 

server/api/views/listMeds/views.py

@@ -24,6 +24,7 @@ class GetMedication(APIView):
     def post(self, request):
         data = request.data
         state_query = data.get('state', '')
+        print(state_query)
         include_result = []
         exclude_result = []
         for condition in MEDS_INCLUDE:
@@ -43,7 +44,8 @@ def post(self, request):
         meds = {'first': [], 'second': [], 'third': []}
 
         priorMeds = data.get('priorMedications', "").split(',')
-        exclude_result.extend([med.strip() for med in priorMeds if med.strip()])
+        exclude_result.extend([med.strip()
+                              for med in priorMeds if med.strip()])
         included_set = set(include_result)
         excluded_set = set(exclude_result)
 
@@ -62,7 +64,7 @@ def post(self, request):
                     continue
                 meds[tier_label].append({
                     'name': med_name,
-                    'source': 'diagnosis'
+                    'source': 'diagnosis_' + state_query.lower()
                 })
 
         return Response(meds)
@@ -97,15 +99,15 @@ def post(self, request):
         name = data.get('name', '').strip()
         benefits = data.get('benefits', '').strip()
         risks = data.get('risks', '').strip()
-        
+
         # Validate required fields
         if not name:
             return Response({'error': 'Medication name is required'}, status=status.HTTP_400_BAD_REQUEST)
         if not benefits:
             return Response({'error': 'Medication benefits are required'}, status=status.HTTP_400_BAD_REQUEST)
         if not risks:
             return Response({'error': 'Medication risks are required'}, status=status.HTTP_400_BAD_REQUEST)
-        
+
         # Check if medication already exists
         if Medication.objects.filter(name=name).exists():
             return Response({'error': f'Medication "{name}" already exists'}, status=status.HTTP_400_BAD_REQUEST)
@@ -125,11 +127,11 @@ class DeleteMedication(APIView):
     def delete(self, request):
         data = request.data
         name = data.get('name', '').strip()
-        
+
         # Validate required fields
         if not name:
             return Response({'error': 'Medication name is required'}, status=status.HTTP_400_BAD_REQUEST)
-        
+
         # Check if medication exists and delete
         try:
             medication = Medication.objects.get(name=name)