update

Author: taichan03

frontend/src/pages/RulesManager/RulesManager.tsx

@@ -11,15 +11,19 @@ interface Medication {
   risks: string;
 }
 
+interface MedicationSource {
+  medication: Medication;
+  sources: any[];
+}
+
 interface MedRule {
   id: number;
   rule_type: string;
   history_type: string;
   reason: string;
   label: string;
-  medications: Medication[];
-  sources: any[];
   explanation: string | null;
+  medication_sources: MedicationSource[];
 }
 
 interface MedRulesResponse {
@@ -96,8 +100,11 @@ function RulesManager() {
       return newSet;
     });
   };
-
-  const renderMedicationDetails = (medication: Medication, rule: MedRule) => {
+  const renderMedicationDetails = (
+    medication: Medication,
+    rule: MedRule,
+    sources: any[]
+  ) => {
     if (!medication) return null;
 
     const medKey = `${rule.id}-${medication.name}`;
@@ -171,9 +178,9 @@ function RulesManager() {
                 <h5 className="mb-2 text-sm font-medium text-indigo-600">
                   Sources:
                 </h5>
-                {rule.sources && rule.sources.length > 0 ? (
+                {sources && sources.length > 0 ? (
                   <ul className="list-disc space-y-4 px-4">
-                    {rule.sources.map((source, index) => (
+                    {sources.map((source, index) => (
                       <li key={`${medKey}-source-${index}`} className="text-sm">
                         <div className="p-2 border rounded bg-gray-50">
                           <div>
@@ -228,10 +235,14 @@ function RulesManager() {
               Medications:
             </h3>
             <div className="mt-2">
-              {Array.isArray(rule.medications) &&
-              rule.medications.length > 0 ? (
-                rule.medications.map((med) =>
-                  renderMedicationDetails(med, rule)
+              {Array.isArray(rule.medication_sources) &&
+              rule.medication_sources.length > 0 ? (
+                rule.medication_sources.map((medSrc) =>
+                  renderMedicationDetails(
+                    medSrc.medication,
+                    rule,
+                    medSrc.sources
+                  )
                 )
               ) : (
                 <p className="text-sm text-gray-500">

server/api/views/medRules/serializers.py

@@ -1,30 +1,49 @@
 from rest_framework import serializers
-from ...models.model_medRule import MedRule
+from ...models.model_medRule import MedRule, MedRuleSource
+from ..listMeds.models import Medication
 from ..listMeds.serializers import MedicationSerializer
 from ...models.model_embeddings import Embeddings
-from ..listMeds.models import Medication
+
 
 class EmbeddingsSerializer(serializers.ModelSerializer):
     class Meta:
         model = Embeddings
         fields = ['guid', 'name', 'text', 'page_num', 'chunk_number']
 
 
+class MedicationWithSourcesSerializer(serializers.Serializer):
+    medication = MedicationSerializer()
+    sources = EmbeddingsSerializer(many=True)
+
+
 class MedRuleSerializer(serializers.ModelSerializer):
-    medications = MedicationSerializer(many=True, read_only=True)
-    medication_ids = serializers.PrimaryKeyRelatedField(
-        many=True, write_only=True, queryset=Medication.objects.all(), source='medications'
-    )
-    sources = EmbeddingsSerializer(many=True, read_only=True)
-    source_ids = serializers.PrimaryKeyRelatedField(
-        many=True, write_only=True, queryset=Embeddings.objects.all(), source='sources'
-    )
+    medication_sources = serializers.SerializerMethodField()
 
     class Meta:
         model = MedRule
         fields = [
-            'id', 'rule_type', 'history_type', 'reason', 'label',
-            'medications', 'medication_ids',
-            'sources', 'source_ids',
-            'explanation'
-        ]
+            'id', 'rule_type', 'history_type', 'reason', 'label', 'explanation',
+            'medication_sources'
+        ]
+
+    def get_medication_sources(self, obj):
+
+        medrule_sources = MedRuleSource.objects.filter(
+            medrule=obj).select_related('medication', 'embedding')
+
+        med_to_sources = {}
+        for ms in medrule_sources:
+            if ms.medication.id not in med_to_sources:
+                med_to_sources[ms.medication.id] = {
+                    'medication': ms.medication,
+                    'sources': []
+                }
+            med_to_sources[ms.medication.id]['sources'].append(ms.embedding)
+
+        return [
+            {
+                'medication': MedicationSerializer(data['medication']).data,
+                'sources': EmbeddingsSerializer(data['sources'], many=True).data
+            }
+            for data in med_to_sources.values()
+        ]