From a633663de876e3a12a314bf2db09a436d4ea9a39 Mon Sep 17 00:00:00 2001 From: ens-lgil Date: Wed, 9 Sep 2026 10:13:51 +0100 Subject: [PATCH] Minor changes in some search indexes --- requirements.txt | 4 ++-- requirements_local.txt | 2 +- search_es/documents/pathway.py | 8 +++----- search_es/documents/score.py | 11 ++++++----- search_es/views.py | 2 +- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/requirements.txt b/requirements.txt index 38b0ea0..b9a310a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,10 +2,10 @@ Django==6.0.8 #### Python PostgreSQL library #### # psycopg2-binary==2.9.11 -psycopg[binary]==3.3.4 +psycopg[binary]==3.3.5 # psycopg==3.2.10 #### Django REST API libraries #### -djangorestframework==3.17.2 +djangorestframework==3.18.1 django-cors-headers==4.9.0 #### Elasticsearch libraries #### elasticsearch==8.19.3 diff --git a/requirements_local.txt b/requirements_local.txt index 50cd2bf..26d0c58 100644 --- a/requirements_local.txt +++ b/requirements_local.txt @@ -6,4 +6,4 @@ openpyxl==3.1.5 PyYAML==6.0.3 # For testing only: -django-debug-toolbar==7.0.0 +django-debug-toolbar==8.0.0 diff --git a/search_es/documents/pathway.py b/search_es/documents/pathway.py index 4e45ae4..29abfa4 100644 --- a/search_es/documents/pathway.py +++ b/search_es/documents/pathway.py @@ -26,11 +26,9 @@ def fetch_mt_data(objects_list): @registry.register_document class PathwayDocument(Document): """ Pathway elasticsearch document """ - name = fields.TextField( - analyzer=name_delimiter#, - # fields={ - # 'raw': fields.KeywordField() - # } + pathway_name = fields.TextField( + attr="name", + analyzer=name_delimiter ) id = fields.TextField(attr="external_id", analyzer=id_analyzer) external_id_source = fields.TextField(index=False) diff --git a/search_es/documents/score.py b/search_es/documents/score.py index c3e064b..41f4a0d 100644 --- a/search_es/documents/score.py +++ b/search_es/documents/score.py @@ -23,11 +23,9 @@ class ScoreDocument(Document): """ Score elasticsearch document """ id = fields.TextField(analyzer=id_analyzer) - name = fields.TextField( - analyzer=name_delimiter#, - # fields={ - # 'raw': fields.KeywordField() - # } + score_name = fields.TextField( + attr="name", + analyzer=name_delimiter ) variants_number = fields.IntegerField(index=False, doc_values=False) platform_name = fields.TextField(index=False) @@ -51,6 +49,9 @@ class ScoreDocument(Document): } ) + def prepare_genes_data(self, instance): + return instance.name + def prepare_genes_data(self, instance): # Limit fetch of gene data to protein and gene platforms omics_type = self.get_omics_type(instance) diff --git a/search_es/views.py b/search_es/views.py index 1e8e977..1f3826c 100644 --- a/search_es/views.py +++ b/search_es/views.py @@ -9,7 +9,7 @@ result_size = 50 def query_fields(): - return ['id^5','id_colon^5','label^6','name^4','categories_list','synonyms_list^3','description^3', + return ['id^5','id_colon^5','label^6','name^4','pathway_name^3','score_name','categories_list','synonyms_list^3','description^3', 'trait_reported', 'trait_reported_id', 'traits_reported_list^2', 'genes.external_id^2','genes.name^2','genes.synonyms_list^2','genes.description', 'proteins.external_id^2','proteins.names^2','proteins.synonyms_list^2','proteins.description',