Updates

mapping_workbench/backend/conceptual_mapping_rule/models/entity.py

@@ -1,8 +1,10 @@
+from datetime import datetime
 from enum import Enum
 from typing import Optional, List
 
 import pymongo
 from beanie import Link, Indexed
+from pydantic import BaseModel
 from pymongo import IndexModel
 
 from mapping_workbench.backend.core.models.base_project_resource_entity import BaseProjectResourceEntity, \
@@ -11,13 +13,28 @@
 from mapping_workbench.backend.ontology.models.term import TermValidityResponse
 from mapping_workbench.backend.sparql_test_suite.models.entity import SPARQLTestFileResource
 from mapping_workbench.backend.triple_map_fragment.models.entity import GenericTripleMapFragment
+from mapping_workbench.backend.user.models.user import User
 
 
 class ConceptualMappingRuleTermsValidity(Enum):
     VALID = "valid"
     INVALID = "invalid"
 
 
+class ConceptualMappingRuleCommentPriority(Enum):
+    HIGH = "high"
+    NORMAL = "normal"
+    LOW = "low"
+
+
+class ConceptualMappingRuleComment(BaseModel):
+    title: Optional[str] = None
+    comment: Optional[str] = None
+    priority: Optional[ConceptualMappingRuleCommentPriority] = ConceptualMappingRuleCommentPriority.NORMAL
+    created_at: Optional[datetime] = None
+    created_by: Optional[Link[User]] = None
+
+
 class ConceptualMappingRuleIn(BaseProjectResourceEntityInSchema):
     field_id: Optional[str] = None
     field_title: Optional[str] = None
@@ -51,6 +68,8 @@ class ConceptualMappingRuleOut(BaseProjectResourceEntityOutSchema):
     mapping_packages: Optional[List[Link[MappingPackage]]] = None
     triple_map_fragment: Optional[Link[GenericTripleMapFragment]] = None
     sparql_assertions: Optional[List[Link[SPARQLTestFileResource]]] = None
+    notes: Optional[List[ConceptualMappingRuleComment]] = None
+    comments: Optional[List[ConceptualMappingRuleComment]] = None
 
 
 class ConceptualMappingRule(BaseProjectResourceEntity):
@@ -66,6 +85,8 @@ class ConceptualMappingRule(BaseProjectResourceEntity):
     mapping_packages: Optional[List[Optional[Link[MappingPackage]]]] = None
     triple_map_fragment: Optional[Link[GenericTripleMapFragment]] = None
     sparql_assertions: Optional[List[Link[SPARQLTestFileResource]]] = None
+    notes: Optional[List[ConceptualMappingRuleComment]] = None
+    comments: Optional[List[ConceptualMappingRuleComment]] = None
 
     class Settings(BaseProjectResourceEntity.Settings):
         name = "conceptual_mapping_rules"

mapping_workbench/backend/conceptual_mapping_rule/services/api.py

@@ -1,4 +1,4 @@
-from typing import List
+from typing import List, Dict
 
 from beanie import PydanticObjectId
 from pymongo.errors import DuplicateKeyError
@@ -21,16 +21,6 @@ async def list_conceptual_mapping_rules(filters: dict = None, page: int = None,
     prepare_search_param(query_filters)
     skip, limit = pagination_params(page, limit)
 
-    # update terms_validity info for queried rules
-    for item in await ConceptualMappingRule.find(query_filters).to_list():
-        item.target_class_path_terms_validity = await check_content_terms_validity(item.target_class_path)
-        item.target_property_path_terms_validity = await check_content_terms_validity(item.target_property_path)
-        item.terms_validity = ConceptualMappingRuleTermsValidity.INVALID \
-            if any(not x.is_valid for x in item.target_class_path_terms_validity) \
-            or any(not x.is_valid for x in item.target_property_path_terms_validity) \
-            else ConceptualMappingRuleTermsValidity.VALID
-        await item.save()
-
     items: List[ConceptualMappingRuleOut] = await ConceptualMappingRule.find(
         query_filters,
         projection_model=ConceptualMappingRuleOut,
@@ -59,13 +49,17 @@ async def create_conceptual_mapping_rule(data: ConceptualMappingRuleCreateIn,
 async def update_conceptual_mapping_rule(conceptual_mapping_rule: ConceptualMappingRule,
                                          data: ConceptualMappingRuleUpdateIn,
                                          user: User) -> ConceptualMappingRuleOut:
-    return ConceptualMappingRuleOut(**(
-        await conceptual_mapping_rule.set(request_update_data(data, user=user))
-    ).model_dump())
+    update_data = request_update_data(data, user=user)
+    terms_validated_rule = await rule_terms_validator(ConceptualMappingRule(**update_data))
+    update_data['target_class_path_terms_validity'] = terms_validated_rule.target_class_path_terms_validity
+    update_data['target_property_path_terms_validity'] = terms_validated_rule.target_property_path_terms_validity
+    update_data['terms_validity'] = terms_validated_rule.terms_validity
+    rule: ConceptualMappingRule = await conceptual_mapping_rule.set(update_data)
+    return ConceptualMappingRuleOut(**rule.model_dump())
 
 
 async def clone_conceptual_mapping_rule(conceptual_mapping_rule: ConceptualMappingRule,
-                                         user: User) -> ConceptualMappingRuleOut:
+                                        user: User) -> ConceptualMappingRuleOut:
     cloned_conceptual_mapping_rule: ConceptualMappingRule = \
         await conceptual_mapping_rule.model_copy(
             update={"id": None, "updated_at": None, "updated_by": None}
@@ -89,3 +83,27 @@ async def get_conceptual_mapping_rule_out(id: PydanticObjectId) -> ConceptualMap
 
 async def delete_conceptual_mapping_rule(conceptual_mapping_rule: ConceptualMappingRule):
     return await conceptual_mapping_rule.delete()
+
+
+async def rule_terms_validator(rule: ConceptualMappingRule) -> ConceptualMappingRule:
+    rule.target_class_path_terms_validity = await check_content_terms_validity(rule.target_class_path)
+    rule.target_property_path_terms_validity = await check_content_terms_validity(rule.target_property_path)
+    rule.terms_validity = ConceptualMappingRuleTermsValidity.INVALID \
+        if any(not x.is_valid for x in rule.target_class_path_terms_validity) \
+           or any(not x.is_valid for x in rule.target_property_path_terms_validity) \
+        else ConceptualMappingRuleTermsValidity.VALID
+
+    return rule
+
+
+async def validate_and_save_rules_terms(query_filters: Dict = None):
+    """
+    update terms_validity info for queried rules
+
+    :param query_filters:
+    :return:
+    """
+
+    for item in await ConceptualMappingRule.find(query_filters or {}).to_list():
+        item = await rule_terms_validator(item)
+        await item.save()

mapping_workbench/backend/core/entrypoints/api/main.py

@@ -44,6 +44,9 @@
 from mapping_workbench.backend.user.entrypoints.api import routes as user_routes
 from mapping_workbench.backend.user.models.user import User
 
+from mapping_workbench.backend.tasks.entrypoints.api import routes as tasks_routes
+
+
 ROOT_API_PATH = "/api/v1"
 
 google_oauth_client = GoogleOAuth2("CLIENT_ID", "CLIENT_SECRET")
@@ -118,7 +121,8 @@ async def on_startup():
     specific_triple_map_fragment_routes.router,
     generic_triple_map_fragment_routes.router,
     config_routes.router,
-    ontology_routes.router
+    ontology_routes.router,
+    tasks_routes.router
 ]
 
 for secured_router in secured_routers:

mapping_workbench/backend/core/models/api_request.py

@@ -11,3 +11,7 @@ class APIRequestWithId(BaseModel):
 class APIRequestForUpdateMany(BaseModel):
     for_query: Optional[Dict]
     set_values: Optional[Dict]
+
+
+class APIRequestWithProject(BaseModel):
+    project: Optional[PydanticObjectId] = None

mapping_workbench/backend/ontology/models/namespace.py

@@ -20,7 +20,7 @@ class NamespaceOut(BaseEntityOutSchema):
 
 
 class Namespace(BaseEntity):
-    prefix: Indexed(str, unique=True)
+    prefix: Indexed(str, unique=False)
     uri: Optional[str] = None
     is_syncable: Optional[bool] = True
 

mapping_workbench/backend/tasks/entrypoints/api/routes.py

@@ -0,0 +1,28 @@
+from typing import Dict
+
+from beanie import PydanticObjectId
+from fastapi import APIRouter
+
+from mapping_workbench.backend.core.models.api_request import APIRequestWithProject
+from mapping_workbench.backend.tasks.services.terms_validator import task_terms_validator
+
+ROUTE_PREFIX = "/tasks"
+TAG = "task"
+NAME_FOR_MANY = "tasks"
+NAME_FOR_ONE = "task"
+
+router = APIRouter(
+    prefix=ROUTE_PREFIX,
+    tags=[TAG]
+)
+
+
+@router.post(
+    "/terms_validator",
+    description=f"{NAME_FOR_ONE} Terms Validator",
+    name=f"{NAME_FOR_MANY}:{NAME_FOR_ONE}_terms_validator"
+)
+async def route_task_terms_validator(
+        filters: APIRequestWithProject = None
+):
+    return await task_terms_validator(filters)

mapping_workbench/backend/tasks/services/terms_validator.py

@@ -0,0 +1,14 @@
+from typing import Dict
+
+from mapping_workbench.backend.conceptual_mapping_rule.services.api import validate_and_save_rules_terms
+from mapping_workbench.backend.core.models.api_request import APIRequestWithProject
+from mapping_workbench.backend.project.models.entity import Project
+
+
+async def task_terms_validator(filters: APIRequestWithProject = None):
+    query_filters: Dict = {}
+
+    if filters.project:
+        query_filters['project'] = Project.link_from_id(filters.project)
+
+    await validate_and_save_rules_terms(query_filters)

mapping_workbench/frontend/src/api/tasks/index.js

@@ -0,0 +1,32 @@
+import {SectionApi} from "../section";
+import {appApi} from "../app";
+import {apiPaths} from "../../paths";
+
+class TasksApi {
+    get TASKS_TITLE() {
+        return "Tasks";
+    }
+
+    get TASK_TITLE() {
+        return "Task";
+    }
+
+    constructor() {
+        this.section = "tasks";
+        this.paths = apiPaths[this.section];
+    }
+
+    async runTermsValidator(request = {}) {
+        try {
+            let endpoint = this.paths['terms_validator'];
+            let filters = {}
+            if (request['filters']) {
+                filters = request['filters'];
+            }
+            return appApi.post(endpoint, filters);
+        } catch (err) {
+        }
+    }
+}
+
+export const tasksApi = new TasksApi();

mapping_workbench/frontend/src/layouts/app/config.js

@@ -9,6 +9,7 @@ import FolderOpenIcon from '@mui/icons-material/FolderOpen';
 import HiveIcon from '@mui/icons-material/Hive';
 import MapIcon from '@mui/icons-material/Map';
 import SchemaIcon from '@mui/icons-material/Schema';
+import TaskIcon from '@mui/icons-material/TaskAlt';
 
 import HomeSmileIcon from 'src/icons/ui/duocolor/home-smile';
 import LayoutAlt02 from 'src/icons/ui/duocolor/layout-alt-02';
@@ -252,6 +253,21 @@ export const useSections = () => {
                         }
                     ]
                 },
+                {
+                    title: t(tokens.nav.tasks),
+                    path: paths.app.tasks.index,
+                    icon: (
+                        <SvgIcon fontSize="small">
+                            <TaskIcon/>
+                        </SvgIcon>
+                    ),
+                    items: [
+                        {
+                            title: t(tokens.nav.terms_validator),
+                            path: paths.app.tasks.terms_validator
+                        }
+                    ]
+                },
                 {
                     title: t(tokens.nav.users),
                     path: paths.app.users.index,

mapping_workbench/frontend/src/locales/tokens.js

@@ -72,5 +72,7 @@ export const tokens = {
 
     admin: 'nav.admin',
     users: 'nav.users',
+    terms_validator: 'nav.terms_validator',
+    tasks: 'nav.tasks'
   }
 };

mapping_workbench/frontend/src/locales/translations/en.js

@@ -69,4 +69,6 @@ export const en = {
   [tokens.nav.triple_map_fragments]: 'Triple Maps',
   [tokens.nav.specific_triple_map_fragments]: 'Specific Triple Maps',
   [tokens.nav.generic_triple_map_fragments]: 'Generic Triple Maps',
+  [tokens.nav.terms_validator]: 'Terms Validator',
+  [tokens.nav.tasks]: 'Tasks',
 };

mapping_workbench/frontend/src/pages/app/conceptual-mapping-rules/create.js

@@ -1,6 +1,4 @@
 import ArrowLeftIcon from '@untitled-ui/icons-react/build/esm/ArrowLeft';
-import Box from '@mui/material/Box';
-import Container from '@mui/material/Container';
 import Link from '@mui/material/Link';
 import Stack from '@mui/material/Stack';
 import SvgIcon from '@mui/material/SvgIcon';

mapping_workbench/frontend/src/pages/app/mapping-packages/import.js

@@ -1,5 +1,3 @@
-import Box from '@mui/material/Box';
-import Container from '@mui/material/Container';
 import Link from '@mui/material/Link';
 import Stack from '@mui/material/Stack';
 import SvgIcon from '@mui/material/SvgIcon';