OpenConceptLab/ocl_issues#2307 | Multi Algo configuration

snyaggarwal · snyaggarwal · commit 7abec623dce3 · 2026-02-11T18:00:02.000+05:30
diff --git a/core/map_projects/migrations/0024_mapproject_algorithms.py b/core/map_projects/migrations/0024_mapproject_algorithms.py
@@ -0,0 +1,19 @@
+# Generated by Django 4.2.16 on 2026-02-06 06:30
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('map_projects', '0023_remove_mapproject_reranker'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='mapproject',
+            name='algorithms',
+            field=django.contrib.postgres.fields.ArrayField(base_field=models.JSONField(), blank=True, default=list, null=True, size=None),
+        ),
+    ]
diff --git a/core/map_projects/migrations/0025_auto_20260206_0630.py b/core/map_projects/migrations/0025_auto_20260206_0630.py
@@ -0,0 +1,81 @@
+# Generated by Django 4.2.16 on 2026-02-06 06:30
+
+from django.db import migrations
+
+def update_algorithms(apps, schema_editor):
+    MapProject = apps.get_model('map_projects', 'MapProject')
+    for project in MapProject.objects.filter():
+        algos = []
+        if project.matching_algorithm == 'es':
+            algos.append({
+                'id': 'ocl-search',
+                'name': 'OCL Search Algorithm',
+                'type': 'ocl-search',
+                'provider': 'ocl',
+                'order': 1,
+                'batch_size': 50,
+                'concurrent_requests': 2
+            })
+        if project.matching_algorithm == 'llm':
+            algos.append({
+                'id': 'ocl-semantic',
+                'name': 'OCL Semantic Algorithm',
+                'type': 'ocl-semantic',
+                'provider': 'ocl',
+                'order': 1,
+                'batch_size': 10,
+                'concurrent_requests': 2,
+                'query_params': {
+                    'semantic': True
+                }
+            })
+        if project.matching_algorithm == 'custom' and project.match_api_url:
+            algos.append({
+                'id': 'custom',
+                'name': 'Custom Algorithm',
+                'type': 'custom',
+                'provider': 'external',
+                'order': 1,
+                'batch_size': project.batch_size,
+                'url': project.match_api_url,
+                'token': project.match_api_token,
+                'concurrent_requests': 1,
+            })
+        if project.bridge_enabled:
+            algos.append({
+                'id': 'ocl-ciel-bridge',
+                'name': 'OCL CIEL Bridge Terminology',
+                'type': 'ocl-ciel-bridge',
+                'provider': 'ocl',
+                'order': 2,
+                'batch_size': 10,
+                'concurrent_requests': 2,
+                'query_params': {
+                    'semantic': True
+                },
+                'target_repo_url': '/orgs/CIEL/sources/CIEL/'
+            })
+        if project.scispacy_enabled:
+            algos.append({
+                'id': 'ocl-scispacy-loinc',
+                'name': 'OCL ScispaCy LOINC Algorithm',
+                'type': 'ocl-scispacy',
+                'provider': 'ocl',
+                'order': 3,
+                'batch_size': 2,
+                'concurrent_requests': 1,
+            })
+        if algos:
+            project.algorithms = algos
+            project.save(update_fields=['algorithms'])
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('map_projects', '0024_mapproject_algorithms'),
+    ]
+
+    operations = [
+        migrations.RunPython(update_algorithms),
+    ]
diff --git a/core/map_projects/migrations/0026_remove_mapproject_batch_size_and_more.py b/core/map_projects/migrations/0026_remove_mapproject_batch_size_and_more.py
@@ -0,0 +1,37 @@
+# Generated by Django 4.2.16 on 2026-02-11 12:09
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('map_projects', '0025_auto_20260206_0630'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='mapproject',
+            name='batch_size',
+        ),
+        migrations.RemoveField(
+            model_name='mapproject',
+            name='bridge_enabled',
+        ),
+        migrations.RemoveField(
+            model_name='mapproject',
+            name='match_api_token',
+        ),
+        migrations.RemoveField(
+            model_name='mapproject',
+            name='match_api_url',
+        ),
+        migrations.RemoveField(
+            model_name='mapproject',
+            name='matching_algorithm',
+        ),
+        migrations.RemoveField(
+            model_name='mapproject',
+            name='scispacy_enabled',
+        ),
+    ]
diff --git a/core/map_projects/models.py b/core/map_projects/models.py
@@ -30,19 +30,12 @@ class MapProject(BaseModel):
     matches = ArrayField(models.JSONField(), default=list, null=True, blank=True)
     columns = ArrayField(models.JSONField(), default=list)
     target_repo_url = models.TextField(null=True, blank=True)
-    matching_algorithm = models.CharField(max_length=100, null=True, blank=True)
+    algorithms = ArrayField(models.JSONField(), default=list, null=True, blank=True)
     include_retired = models.BooleanField(default=False)
     logs = models.JSONField(default=dict, null=True, blank=True)
     score_configuration = models.JSONField(default=default_score_configuration, null=True, blank=True)
     filters = models.JSONField(default=dict, null=True, blank=True)
     candidates = models.JSONField(default=dict, null=True, blank=True)
-    bridge_enabled = models.BooleanField(default=False)
-    scispacy_enabled = models.BooleanField(default=False)
-
-    # Custom API
-    match_api_url = models.TextField(null=True, blank=True)
-    match_api_token = models.TextField(null=True, blank=True)
-    batch_size = models.IntegerField(null=True, blank=True, default=BATCH_SIZE)
 
     class Meta:
         db_table = 'map_projects'
@@ -172,6 +165,7 @@ def format_request_data(cls, data, parent_resource=None):
         cls.format_json(new_data, 'score_configuration')
         cls.format_json(new_data, 'filters')
         cls.format_json(new_data, 'candidates')
+        cls.format_json(new_data, 'algorithms')
 
         if parent_resource:
             new_data[parent_resource.resource_type.lower() + '_id'] = parent_resource.id
@@ -195,8 +189,6 @@ def soft_delete(self):
 
     def clean(self):
         self.clean_filters()
-        if not self.batch_size:
-            self.batch_size = self.BATCH_SIZE
         if not self.include_retired:
             self.include_retired = False
         if self.matches:
diff --git a/core/map_projects/serializers.py b/core/map_projects/serializers.py
@@ -21,9 +21,8 @@ class Meta:
             'id', 'name', 'input_file_name', 'matches', 'columns',
             'created_by', 'updated_by', 'created_at', 'updated_at', 'url', 'is_active',
             'public_access', 'file', 'user_id', 'organization_id', 'description',
-            'target_repo_url', 'matching_algorithm', 'include_retired', 'score_configuration',
-            'match_api_url', 'match_api_token', 'batch_size', 'filters', 'candidates',
-            'bridge_enabled', 'scispacy_enabled'
+            'target_repo_url', 'include_retired', 'score_configuration',
+            'filters', 'candidates', 'algorithms'
         ]
 
     def prepare_object(self, validated_data, instance=None, file=None):
@@ -36,9 +35,8 @@ def prepare_object(self, validated_data, instance=None, file=None):
         if columns is not False:
             instance.columns = columns
         for attr in [
-            'name', 'description', 'extras', 'target_repo_url', 'matching_algorithm', 'include_retired',
-            'score_configuration', 'match_api_url', 'match_api_token', 'batch_size', 'filters', 'candidates',
-            'bridge_enabled', 'scispacy_enabled'
+            'name', 'description', 'extras', 'target_repo_url', 'include_retired',
+            'score_configuration', 'filters', 'candidates', 'algorithms'
         ]:
             setattr(instance, attr, validated_data.get(attr, get(instance, attr)))
         if not instance.id:
@@ -110,9 +108,8 @@ class Meta:
             'id', 'name', 'input_file_name',
             'created_by', 'updated_by', 'created_at', 'updated_at', 'url', 'is_active',
             'owner', 'owner_type', 'owner_url', 'public_access',
-            'target_repo_url', 'matching_algorithm', 'summary', 'logs', 'include_retired',
-            'score_configuration', 'match_api_url', 'match_api_token', 'batch_size', 'filters', 'candidates',
-            'bridge_enabled', 'scispacy_enabled'
+            'target_repo_url', 'summary', 'logs', 'include_retired',
+            'score_configuration', 'filters', 'candidates', 'algorithms'
         ]
 
     def __init__(self, *args, **kwargs):
