changed imports to without _ms

Author: claudiomansillab

multisurveys-apis/src/core/repository/queries/classifiers.py

@@ -1,6 +1,6 @@
 from typing import Callable
 from contextlib import AbstractContextManager
-from db_plugins.db.sql.models import classifier_ms, Taxonomy_ms
+from db_plugins.db.sql.models import classifier, Taxonomy
 from sqlalchemy.orm import Session
 from sqlalchemy import select
 
@@ -22,13 +22,13 @@ def get_classifier_by_name(
     """
     with session_factory() as session:
         stmt = (
-            select(classifier_ms, Taxonomy_ms)
+            select(classifier, Taxonomy)
             .join(
-                Taxonomy_ms,
-                classifier_ms.classifier_id == Taxonomy_ms.classifier_id,
+                Taxonomy,
+                classifier.classifier_id == Taxonomy.classifier_id,
             )
-            .where(classifier_ms.classifier_name == classifier_name)
-            .order_by(Taxonomy_ms.order.asc())
+            .where(classifier.classifier_name == classifier_name)
+            .order_by(Taxonomy.order.asc())
         )
         result = session.execute(stmt).all()
         return result
@@ -49,13 +49,13 @@ def get_all_classifiers(
     """
     with session_factory() as session:
         stmt = (
-            select(classifier_ms, Taxonomy_ms)
+            select(classifier, Taxonomy)
             .join(
-                Taxonomy_ms,
-                classifier_ms.classifier_id == Taxonomy_ms.classifier_id,
+                Taxonomy,
+                classifier.classifier_id == Taxonomy.classifier_id,
             )
             .order_by(
-                classifier_ms.classifier_name.asc(), Taxonomy_ms.order.asc()
+                classifier.classifier_name.asc(), Taxonomy.order.asc()
             )
         )
         result = session.execute(stmt)

multisurveys-apis/src/object_api/services/statements_sql.py

@@ -1,4 +1,4 @@
-from db_plugins.db.sql.models import Object, Probability_ms
+from db_plugins.db.sql.models import Object, Probability
 from sqlalchemy import text
 
 
@@ -91,22 +91,22 @@ def probability_filters(args):
     filters_prob_dict = []
 
     if args["classifier"]:
-        classifier = Probability_ms.classifier_id == args["classifier"]
+        classifier = Probability.classifier_id == args["classifier"]
         filters_prob_dict.append(classifier)
     if args["class_name"]:
-        class_ = Probability_ms.class_id == args["class_name"]
+        class_ = Probability.class_id == args["class_name"]
         filters_prob_dict.append(class_)
     if args["probability"]:
-        probability = Probability_ms.probability >= args["probability"]
+        probability = Probability.probability >= args["probability"]
         filters_prob_dict.append(probability)
     if args["ranking"]:
-        ranking = Probability_ms.ranking == args["ranking"]
+        ranking = Probability.ranking == args["ranking"]
         filters_prob_dict.append(ranking)
     elif not args["ranking"] and (
         args["classifier"] or args["class"] or args["classifier_version"]
     ):
         # Default ranking 1
-        ranking = Probability_ms.ranking == 1
+        ranking = Probability.ranking == 1
         filters_prob_dict.append(ranking)
 
     return filters_prob_dict