updated ontology namespace structure

webclinic017 · Feb 19, 2022 · 6991576 · 6991576
1 parent 88cffbc
commit 6991576
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 9 deletions.
diff --git a/forte/ontology_specs/ag_news.json b/forte/ontology_specs/ag_news.json
@@ -4,11 +4,11 @@
       "base_ontology.json"
     ],
     "additional_prefixes": [
-        "ftx"
+        "ftx.news"
     ],
     "definitions": [
       {
-        "entry_name": "ftx.onto.ag_news.Description",
+        "entry_name": "ftx.news.ag_news.Description",
         "parent_entry": "forte.data.ontology.top.Annotation"
       }
     ]

diff --git a/forte/ontology_specs/medical.json b/forte/ontology_specs/medical.json
@@ -4,11 +4,11 @@
     "base_ontology.json"
   ],
   "additional_prefixes": [
-    "ftx.medical"
+    "ftx.medical.clinical"
   ],
   "definitions": [
         {
-      "entry_name": "ftx.medical.UMLSConceptLink",
+      "entry_name": "ftx.medical.clinical.UMLSConceptLink",
       "parent_entry": "forte.data.ontology.top.Generics",
       "description": "A umls concept entity, used to represent basic information of a umls concept",
       "attributes": [
@@ -41,7 +41,7 @@
       ]
     },
     {
-      "entry_name": "ftx.medical.MedicalEntityMention",
+      "entry_name": "ftx.medical.clinical.MedicalEntityMention",
       "parent_entry": "ft.onto.base_ontology.EntityMention",
       "description": "A span based annotation class MedicalEntityMention, used to represent an Entity Mention in medical domain",
       "attributes": [
@@ -52,7 +52,7 @@
         {
             "name": "umls_entities",
             "type": "List",
-            "item_type": "ftx.medical.UMLSConceptLink"
+            "item_type": "ftx.medical.clinical.UMLSConceptLink"
         }
       ]
     }

diff --git a/forte/ontology_specs/race_qa.json b/forte/ontology_specs/race_qa.json
@@ -4,12 +4,12 @@
     "base_ontology.json"
   ],
   "additional_prefixes": [
-    "ftx.onto.race_qa"
+    "ftx.mcqs"
   ],
 
   "definitions": [
     {
-      "entry_name": "ftx.onto.race_qa.Passage",
+      "entry_name": "ftx.mcqs.race_qa.Passage",
       "parent_entry": "forte.data.ontology.top.Annotation",
       "attributes": [
         {

diff --git a/ftx/__init__.py → ftx/mcqs/__init__.py b/ftx/__init__.py → ftx/mcqs/__init__.py
diff --git a/ftx/onto/race_qa.py → ftx/mcqs/race_qa.py b/ftx/onto/race_qa.py → ftx/mcqs/race_qa.py
diff --git a/ftx/onto/__init__.py → ftx/medical/__init__.py b/ftx/onto/__init__.py → ftx/medical/__init__.py
diff --git a/ftx/medical.py → ftx/medical/clinical.py b/ftx/medical.py → ftx/medical/clinical.py
diff --git a/ftx/news/__init__.py b/ftx/news/__init__.py
@@ -0,0 +1 @@
+# ***automatically_generated***
diff --git a/ftx/onto/ag_news.py → ftx/news/ag_news.py b/ftx/onto/ag_news.py → ftx/news/ag_news.py
diff --git a/ftx/onto/.generated b/ftx/onto/.generated
diff --git a/setup.py b/setup.py
@@ -17,7 +17,8 @@
     long_description=long_description,
     long_description_content_type="text/markdown",
     license="Apache License Version 2.0",
-    packages=setuptools.find_packages(
+    packages=setuptools.find_namespace_packages(
+        include=['ftx.*'],
         exclude=["scripts*", "examples*", "tests*"]
     ),
     include_package_data=True,