From fdcaddece2319029db4a73cf1a553e166669c3d5 Mon Sep 17 00:00:00 2001 From: Chris Mungall Date: Tue, 5 Jul 2022 16:47:25 -0700 Subject: [PATCH] rename to kgcl_schema (#4) --- .github/workflows/deploy_docs.yml | 2 +- about.yaml | 4 +- mkdocs.yml | 4 +- project/prefixmap/kgcl.yaml | 6 +- pyproject.toml | 12 +- src/{kgcl => kgcl_schema}/README.md | 0 src/{kgcl => kgcl_schema}/__init__.py | 0 src/{kgcl => kgcl_schema}/apply/__init__.py | 0 .../apply/graph_transformer.py | 2 +- .../apply/kgcl_2_sparql.py | 12 +- src/{kgcl => kgcl_schema}/datamodel/kgcl.py | 128 +++++++++--------- .../datamodel/ontology_model.py | 2 +- src/{kgcl => kgcl_schema}/diff/__init__.py | 0 .../diff/change_detection.py | 8 +- .../diff/diff_2_kgcl_existential.py | 8 +- .../diff/diff_2_kgcl_single.py | 16 +-- .../diff/diff_2_kgcl_triple_annotation.py | 10 +- src/{kgcl => kgcl_schema}/diff/graph_diff.py | 0 .../diff/owlstar_sublanguage.py | 0 .../diff/pretty_print_kgcl.py | 14 +- .../diff/render_operations.py | 10 +- .../diff/summary_generation.py | 10 +- src/{kgcl => kgcl_schema}/grammar/__init__.py | 0 src/{kgcl => kgcl_schema}/grammar/kgcl.lark | 0 .../grammar/kgcl_2_rdf.py | 18 +-- src/{kgcl => kgcl_schema}/grammar/parser.py | 23 ++-- src/{kgcl => kgcl_schema}/kgcl.py | 12 +- src/{kgcl => kgcl_schema}/kgcl_diff.py | 10 +- src/{kgcl => kgcl_schema}/schema/__init__.py | 0 src/{kgcl => kgcl_schema}/schema/basics.yaml | 4 +- src/{kgcl => kgcl_schema}/schema/kgcl.yaml | 8 +- .../schema/ontology_model.yaml | 6 +- src/{kgcl => kgcl_schema}/schema/prov.yaml | 2 +- src/{kgcl => kgcl_schema}/utils.py | 12 +- tests/__init__.py | 2 +- tests/cases.py | 4 +- tests/test_cli/test_cli.py | 10 +- tests/test_diff/test_diff.py | 6 +- tests/test_grammar/test_parse.py | 4 +- tests/test_grammar/test_render.py | 6 +- tests/test_model/test_change_model.py | 4 +- tests/test_model/test_conversion.py | 4 +- tests/test_model/test_introspect.py | 2 +- tests/test_model/test_ontology_model.py | 2 +- tests/util.py | 4 +- 45 files changed, 195 insertions(+), 196 deletions(-) rename src/{kgcl => kgcl_schema}/README.md (100%) rename src/{kgcl => kgcl_schema}/__init__.py (100%) rename src/{kgcl => kgcl_schema}/apply/__init__.py (100%) rename src/{kgcl => kgcl_schema}/apply/graph_transformer.py (91%) rename src/{kgcl => kgcl_schema}/apply/kgcl_2_sparql.py (99%) rename src/{kgcl => kgcl_schema}/datamodel/kgcl.py (96%) rename src/{kgcl => kgcl_schema}/datamodel/ontology_model.py (99%) rename src/{kgcl => kgcl_schema}/diff/__init__.py (100%) rename src/{kgcl => kgcl_schema}/diff/change_detection.py (98%) rename src/{kgcl => kgcl_schema}/diff/diff_2_kgcl_existential.py (95%) rename src/{kgcl => kgcl_schema}/diff/diff_2_kgcl_single.py (97%) rename src/{kgcl => kgcl_schema}/diff/diff_2_kgcl_triple_annotation.py (95%) rename src/{kgcl => kgcl_schema}/diff/graph_diff.py (100%) rename src/{kgcl => kgcl_schema}/diff/owlstar_sublanguage.py (100%) rename src/{kgcl => kgcl_schema}/diff/pretty_print_kgcl.py (95%) rename src/{kgcl => kgcl_schema}/diff/render_operations.py (94%) rename src/{kgcl => kgcl_schema}/diff/summary_generation.py (94%) rename src/{kgcl => kgcl_schema}/grammar/__init__.py (100%) rename src/{kgcl => kgcl_schema}/grammar/kgcl.lark (100%) rename src/{kgcl => kgcl_schema}/grammar/kgcl_2_rdf.py (96%) rename src/{kgcl => kgcl_schema}/grammar/parser.py (95%) rename src/{kgcl => kgcl_schema}/kgcl.py (80%) rename src/{kgcl => kgcl_schema}/kgcl_diff.py (96%) rename src/{kgcl => kgcl_schema}/schema/__init__.py (100%) rename src/{kgcl => kgcl_schema}/schema/basics.yaml (83%) rename src/{kgcl => kgcl_schema}/schema/kgcl.yaml (99%) rename src/{kgcl => kgcl_schema}/schema/ontology_model.yaml (97%) rename src/{kgcl => kgcl_schema}/schema/prov.yaml (97%) rename src/{kgcl => kgcl_schema}/utils.py (93%) diff --git a/.github/workflows/deploy_docs.yml b/.github/workflows/deploy_docs.yml index 39436213..68a607d7 100644 --- a/.github/workflows/deploy_docs.yml +++ b/.github/workflows/deploy_docs.yml @@ -8,7 +8,7 @@ on: # paths: # - 'src/docs/*' - # - 'src/kgcl/schema/kgcl.yaml' + # - 'src/kgcl_schema/schema/kgcl_schema.yaml' # A workflow run is made up of one or more jobs that can run sequentially or in parallel diff --git a/about.yaml b/about.yaml index f3b997da..260481b0 100644 --- a/about.yaml +++ b/about.yaml @@ -1,3 +1,3 @@ -name: kgcl +name: kgcl_schema description: Knowledge Graph Change Language. -source_schema_path: src/kgcl/schema/kgcl.yaml +source_schema_path: src/kgcl_schema/schema/kgcl_schema.yaml diff --git a/mkdocs.yml b/mkdocs.yml index 18a0db7e..d5911e29 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -27,5 +27,5 @@ nav: # - Home: home.md - Index: index.md - About: about.md -site_url: https://incatools.github.io/kgcl/ -repo_url: https://github.com/INCATools/kgcl +site_url: https://incatools.github.io/kgcl_schema/ +repo_url: https://github.com/INCATools/kgcl_schema diff --git a/project/prefixmap/kgcl.yaml b/project/prefixmap/kgcl.yaml index b5b556ee..3c3d55e0 100644 --- a/project/prefixmap/kgcl.yaml +++ b/project/prefixmap/kgcl.yaml @@ -1,11 +1,11 @@ { "IAO": "http://purl.obolibrary.org/obo/IAO_", - "basics": "https://w3id.org/kgcl/basics/", + "basics": "https://w3id.org/kgcl_schema/basics/", "dcterms": "http://purl.org/dc/terms/", - "kgcl": "http://w3id.org/kgcl/", + "kgcl": "http://w3id.org/kgcl_schema/", "linkml": "https://w3id.org/linkml/", "oio": "http://www.geneontology.org/formats/oboInOwl#", - "om": "http://w3id.org/kgcl/om/", + "om": "http://w3id.org/kgcl_schema/om/", "owl": "http://www.w3.org/2002/07/owl#", "prov": "http://www.w3.org/ns/prov#", "rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", diff --git a/pyproject.toml b/pyproject.toml index 7cdd133b..65c5f1f0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [tool.poetry] -name = "kgcl" -version = "0.1.0" -description = "Schema fro the KGCL project." +name = "kgcl_schema" +version = "0.0.0" +description = "Schema for the KGCL project." authors = [ "Chris Mungall ", "Harshad Hegde " @@ -25,9 +25,9 @@ requires = ["poetry-core>=1.0.0"] build-backend = "poetry.core.masonry.api" [tool.poetry.scripts] -kgcl-diff = "kgcl.kgcl_diff:cli" -kgcl-apply = "kgcl.kgcl:cli" -kgcl-parse = "kgcl.grammar.parser:cli" +kgcl-diff = "kgcl_schema.kgcl_diff:cli" +kgcl-apply = "kgcl_schema.kgcl:cli" +kgcl-parse = "kgcl_schema.grammar.parser:cli" [tool.poetry.extras] docs = ["linkml", "mkdocs-material"] diff --git a/src/kgcl/README.md b/src/kgcl_schema/README.md similarity index 100% rename from src/kgcl/README.md rename to src/kgcl_schema/README.md diff --git a/src/kgcl/__init__.py b/src/kgcl_schema/__init__.py similarity index 100% rename from src/kgcl/__init__.py rename to src/kgcl_schema/__init__.py diff --git a/src/kgcl/apply/__init__.py b/src/kgcl_schema/apply/__init__.py similarity index 100% rename from src/kgcl/apply/__init__.py rename to src/kgcl_schema/apply/__init__.py diff --git a/src/kgcl/apply/graph_transformer.py b/src/kgcl_schema/apply/graph_transformer.py similarity index 91% rename from src/kgcl/apply/graph_transformer.py rename to src/kgcl_schema/apply/graph_transformer.py index 338c18cb..9059e019 100644 --- a/src/kgcl/apply/graph_transformer.py +++ b/src/kgcl_schema/apply/graph_transformer.py @@ -3,7 +3,7 @@ from typing import List import rdflib -from kgcl.datamodel.kgcl import Change +from kgcl_schema.datamodel.kgcl import Change from .kgcl_2_sparql import convert diff --git a/src/kgcl/apply/kgcl_2_sparql.py b/src/kgcl_schema/apply/kgcl_2_sparql.py similarity index 99% rename from src/kgcl/apply/kgcl_2_sparql.py rename to src/kgcl_schema/apply/kgcl_2_sparql.py index 901c21a3..3fe8d4f4 100644 --- a/src/kgcl/apply/kgcl_2_sparql.py +++ b/src/kgcl_schema/apply/kgcl_2_sparql.py @@ -3,12 +3,12 @@ import re from typing import Optional, List -from kgcl.datamodel.kgcl import (ClassCreation, EdgeCreation, EdgeDeletion, - NewSynonym, NodeAnnotationChange, NodeCreation, - NodeDeepening, NodeDeletion, NodeMove, - NodeObsoletion, NodeRename, NodeShallowing, - NodeUnobsoletion, PlaceUnder, PredicateChange, - RemovedNodeFromSubset, RemoveUnder, Change) +from kgcl_schema.datamodel.kgcl import (ClassCreation, EdgeCreation, EdgeDeletion, + NewSynonym, NodeAnnotationChange, NodeCreation, + NodeDeepening, NodeDeletion, NodeMove, + NodeObsoletion, NodeRename, NodeShallowing, + NodeUnobsoletion, PlaceUnder, PredicateChange, + RemovedNodeFromSubset, RemoveUnder, Change) CURIE_PATTERN = re.compile(r"^(\w+):(\S+)$") diff --git a/src/kgcl/datamodel/kgcl.py b/src/kgcl_schema/datamodel/kgcl.py similarity index 96% rename from src/kgcl/datamodel/kgcl.py rename to src/kgcl_schema/datamodel/kgcl.py index 119e6d1b..22cad5c4 100644 --- a/src/kgcl/datamodel/kgcl.py +++ b/src/kgcl_schema/datamodel/kgcl.py @@ -1,6 +1,6 @@ -# Auto generated from kgcl.yaml by pythongen.py version: 0.9.0 +# Auto generated from kgcl_schema.yaml by pythongen.py version: 0.9.0 # Generation date: 2022-07-04T19:48:32 -# Schema: kgcl +# Schema: kgcl_schema # # id: https://w3id.org/kgcl # description: A data model for describing change operations at a high level on an ontology or ontology-like @@ -38,7 +38,7 @@ IAO = CurieNamespace('IAO', 'http://purl.obolibrary.org/obo/IAO_') BASICS = CurieNamespace('basics', 'https://w3id.org/kgcl/basics/') DCTERMS = CurieNamespace('dcterms', 'http://purl.org/dc/terms/') -KGCL = CurieNamespace('kgcl', 'http://w3id.org/kgcl/') +KGCL = CurieNamespace('kgcl_schema', 'http://w3id.org/kgcl/') LINKML = CurieNamespace('linkml', 'https://w3id.org/linkml/') OIO = CurieNamespace('oio', 'http://www.geneontology.org/formats/oboInOwl#') OM = CurieNamespace('om', 'http://w3id.org/kgcl/om/') @@ -53,7 +53,7 @@ # Types class ChangeClassType(Uriorcurie): - """ CURIE for a class within this datamodel. E.g. kgcl:NodeObsoletion """ + """ CURIE for a class within this datamodel. E.g. kgcl_schema:NodeObsoletion """ type_class_uri = XSD.anyURI type_class_curie = "xsd:anyURI" type_name = "change class type" @@ -272,7 +272,7 @@ class Change(YAMLRoot): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.Change - class_class_curie: ClassVar[str] = "kgcl:Change" + class_class_curie: ClassVar[str] = "kgcl_schema:Change" class_name: ClassVar[str] = "change" class_model_uri: ClassVar[URIRef] = KGCL.Change @@ -327,7 +327,7 @@ class SimpleChange(Change): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.SimpleChange - class_class_curie: ClassVar[str] = "kgcl:SimpleChange" + class_class_curie: ClassVar[str] = "kgcl_schema:SimpleChange" class_name: ClassVar[str] = "simple change" class_model_uri: ClassVar[URIRef] = KGCL.SimpleChange @@ -377,7 +377,7 @@ class ComplexChange(Change): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.ComplexChange - class_class_curie: ClassVar[str] = "kgcl:ComplexChange" + class_class_curie: ClassVar[str] = "kgcl_schema:ComplexChange" class_name: ClassVar[str] = "complex change" class_model_uri: ClassVar[URIRef] = KGCL.ComplexChange @@ -398,7 +398,7 @@ class MultiNodeObsoletion(ComplexChange): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.MultiNodeObsoletion - class_class_curie: ClassVar[str] = "kgcl:MultiNodeObsoletion" + class_class_curie: ClassVar[str] = "kgcl_schema:MultiNodeObsoletion" class_name: ClassVar[str] = "multi node obsoletion" class_model_uri: ClassVar[URIRef] = KGCL.MultiNodeObsoletion @@ -432,7 +432,7 @@ class Transaction(Change): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.Transaction - class_class_curie: ClassVar[str] = "kgcl:Transaction" + class_class_curie: ClassVar[str] = "kgcl_schema:Transaction" class_name: ClassVar[str] = "transaction" class_model_uri: ClassVar[URIRef] = KGCL.Transaction @@ -458,7 +458,7 @@ class ChangeSetSummaryStatistic(YAMLRoot): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.ChangeSetSummaryStatistic - class_class_curie: ClassVar[str] = "kgcl:ChangeSetSummaryStatistic" + class_class_curie: ClassVar[str] = "kgcl_schema:ChangeSetSummaryStatistic" class_name: ClassVar[str] = "change set summary statistic" class_model_uri: ClassVar[URIRef] = KGCL.ChangeSetSummaryStatistic @@ -487,7 +487,7 @@ class ChangeMixin(YAMLRoot): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.ChangeMixin - class_class_curie: ClassVar[str] = "kgcl:ChangeMixin" + class_class_curie: ClassVar[str] = "kgcl_schema:ChangeMixin" class_name: ClassVar[str] = "change mixin" class_model_uri: ClassVar[URIRef] = KGCL.ChangeMixin @@ -500,7 +500,7 @@ class Obsoletion(ChangeMixin): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.Obsoletion - class_class_curie: ClassVar[str] = "kgcl:Obsoletion" + class_class_curie: ClassVar[str] = "kgcl_schema:Obsoletion" class_name: ClassVar[str] = "obsoletion" class_model_uri: ClassVar[URIRef] = KGCL.Obsoletion @@ -524,7 +524,7 @@ class DatatypeOrLanguageTagChange(ChangeMixin): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.DatatypeOrLanguageTagChange - class_class_curie: ClassVar[str] = "kgcl:DatatypeOrLanguageTagChange" + class_class_curie: ClassVar[str] = "kgcl_schema:DatatypeOrLanguageTagChange" class_name: ClassVar[str] = "datatype or language tag change" class_model_uri: ClassVar[URIRef] = KGCL.DatatypeOrLanguageTagChange @@ -534,7 +534,7 @@ class LanguageTagChange(DatatypeOrLanguageTagChange): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.LanguageTagChange - class_class_curie: ClassVar[str] = "kgcl:LanguageTagChange" + class_class_curie: ClassVar[str] = "kgcl_schema:LanguageTagChange" class_name: ClassVar[str] = "language tag change" class_model_uri: ClassVar[URIRef] = KGCL.LanguageTagChange @@ -555,7 +555,7 @@ class DatatypeChange(DatatypeOrLanguageTagChange): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.DatatypeChange - class_class_curie: ClassVar[str] = "kgcl:DatatypeChange" + class_class_curie: ClassVar[str] = "kgcl_schema:DatatypeChange" class_name: ClassVar[str] = "datatype change" class_model_uri: ClassVar[URIRef] = KGCL.DatatypeChange @@ -568,7 +568,7 @@ class AllowsAutomaticReplacementOfEdges(Obsoletion): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.AllowsAutomaticReplacementOfEdges - class_class_curie: ClassVar[str] = "kgcl:AllowsAutomaticReplacementOfEdges" + class_class_curie: ClassVar[str] = "kgcl_schema:AllowsAutomaticReplacementOfEdges" class_name: ClassVar[str] = "allows automatic replacement of edges" class_model_uri: ClassVar[URIRef] = KGCL.AllowsAutomaticReplacementOfEdges @@ -581,7 +581,7 @@ class Unobsoletion(ChangeMixin): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.Unobsoletion - class_class_curie: ClassVar[str] = "kgcl:Unobsoletion" + class_class_curie: ClassVar[str] = "kgcl_schema:Unobsoletion" class_name: ClassVar[str] = "unobsoletion" class_model_uri: ClassVar[URIRef] = KGCL.Unobsoletion @@ -601,7 +601,7 @@ class Deletion(ChangeMixin): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.Deletion - class_class_curie: ClassVar[str] = "kgcl:Deletion" + class_class_curie: ClassVar[str] = "kgcl_schema:Deletion" class_name: ClassVar[str] = "deletion" class_model_uri: ClassVar[URIRef] = KGCL.Deletion @@ -614,7 +614,7 @@ class Creation(ChangeMixin): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.Creation - class_class_curie: ClassVar[str] = "kgcl:Creation" + class_class_curie: ClassVar[str] = "kgcl_schema:Creation" class_name: ClassVar[str] = "creation" class_model_uri: ClassVar[URIRef] = KGCL.Creation @@ -635,7 +635,7 @@ class SubsetMembershipChange(ChangeMixin): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.SubsetMembershipChange - class_class_curie: ClassVar[str] = "kgcl:SubsetMembershipChange" + class_class_curie: ClassVar[str] = "kgcl_schema:SubsetMembershipChange" class_name: ClassVar[str] = "subset membership change" class_model_uri: ClassVar[URIRef] = KGCL.SubsetMembershipChange @@ -656,7 +656,7 @@ class AddToSubset(SubsetMembershipChange): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.AddToSubset - class_class_curie: ClassVar[str] = "kgcl:AddToSubset" + class_class_curie: ClassVar[str] = "kgcl_schema:AddToSubset" class_name: ClassVar[str] = "add to subset" class_model_uri: ClassVar[URIRef] = KGCL.AddToSubset @@ -677,7 +677,7 @@ class RemoveFromSubset(SubsetMembershipChange): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.RemoveFromSubset - class_class_curie: ClassVar[str] = "kgcl:RemoveFromSubset" + class_class_curie: ClassVar[str] = "kgcl_schema:RemoveFromSubset" class_name: ClassVar[str] = "remove from subset" class_model_uri: ClassVar[URIRef] = KGCL.RemoveFromSubset @@ -702,7 +702,7 @@ class EdgeChange(SimpleChange): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.EdgeChange - class_class_curie: ClassVar[str] = "kgcl:EdgeChange" + class_class_curie: ClassVar[str] = "kgcl_schema:EdgeChange" class_name: ClassVar[str] = "edge change" class_model_uri: ClassVar[URIRef] = KGCL.EdgeChange @@ -740,7 +740,7 @@ class EdgeCreation(EdgeChange): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.EdgeCreation - class_class_curie: ClassVar[str] = "kgcl:EdgeCreation" + class_class_curie: ClassVar[str] = "kgcl_schema:EdgeCreation" class_name: ClassVar[str] = "edge creation" class_model_uri: ClassVar[URIRef] = KGCL.EdgeCreation @@ -795,7 +795,7 @@ class PlaceUnder(EdgeCreation): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.PlaceUnder - class_class_curie: ClassVar[str] = "kgcl:PlaceUnder" + class_class_curie: ClassVar[str] = "kgcl_schema:PlaceUnder" class_name: ClassVar[str] = "place under" class_model_uri: ClassVar[URIRef] = KGCL.PlaceUnder @@ -818,7 +818,7 @@ class EdgeDeletion(EdgeChange): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.EdgeDeletion - class_class_curie: ClassVar[str] = "kgcl:EdgeDeletion" + class_class_curie: ClassVar[str] = "kgcl_schema:EdgeDeletion" class_name: ClassVar[str] = "edge deletion" class_model_uri: ClassVar[URIRef] = KGCL.EdgeDeletion @@ -873,7 +873,7 @@ class RemoveUnder(EdgeDeletion): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.RemoveUnder - class_class_curie: ClassVar[str] = "kgcl:RemoveUnder" + class_class_curie: ClassVar[str] = "kgcl_schema:RemoveUnder" class_name: ClassVar[str] = "remove under" class_model_uri: ClassVar[URIRef] = KGCL.RemoveUnder @@ -896,7 +896,7 @@ class EdgeObsoletion(EdgeChange): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.EdgeObsoletion - class_class_curie: ClassVar[str] = "kgcl:EdgeObsoletion" + class_class_curie: ClassVar[str] = "kgcl_schema:EdgeObsoletion" class_name: ClassVar[str] = "edge obsoletion" class_model_uri: ClassVar[URIRef] = KGCL.EdgeObsoletion @@ -943,7 +943,7 @@ class EdgeRewiring(EdgeChange): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.EdgeRewiring - class_class_curie: ClassVar[str] = "kgcl:EdgeRewiring" + class_class_curie: ClassVar[str] = "kgcl_schema:EdgeRewiring" class_name: ClassVar[str] = "edge rewiring" class_model_uri: ClassVar[URIRef] = KGCL.EdgeRewiring @@ -966,7 +966,7 @@ class MappingCreation(EdgeCreation): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.MappingCreation - class_class_curie: ClassVar[str] = "kgcl:MappingCreation" + class_class_curie: ClassVar[str] = "kgcl_schema:MappingCreation" class_name: ClassVar[str] = "mapping creation" class_model_uri: ClassVar[URIRef] = KGCL.MappingCreation @@ -1010,7 +1010,7 @@ class NodeMove(EdgeChange): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.NodeMove - class_class_curie: ClassVar[str] = "kgcl:NodeMove" + class_class_curie: ClassVar[str] = "kgcl_schema:NodeMove" class_name: ClassVar[str] = "node move" class_model_uri: ClassVar[URIRef] = KGCL.NodeMove @@ -1046,7 +1046,7 @@ class NodeDeepening(NodeMove): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.NodeDeepening - class_class_curie: ClassVar[str] = "kgcl:NodeDeepening" + class_class_curie: ClassVar[str] = "kgcl_schema:NodeDeepening" class_name: ClassVar[str] = "node deepening" class_model_uri: ClassVar[URIRef] = KGCL.NodeDeepening @@ -1073,7 +1073,7 @@ class NodeShallowing(NodeMove): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.NodeShallowing - class_class_curie: ClassVar[str] = "kgcl:NodeShallowing" + class_class_curie: ClassVar[str] = "kgcl_schema:NodeShallowing" class_name: ClassVar[str] = "node shallowing" class_model_uri: ClassVar[URIRef] = KGCL.NodeShallowing @@ -1100,7 +1100,7 @@ class PredicateChange(EdgeChange): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.PredicateChange - class_class_curie: ClassVar[str] = "kgcl:PredicateChange" + class_class_curie: ClassVar[str] = "kgcl_schema:PredicateChange" class_name: ClassVar[str] = "predicate change" class_model_uri: ClassVar[URIRef] = KGCL.PredicateChange @@ -1127,7 +1127,7 @@ class EdgeLogicalInterpretationChange(EdgeChange): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.EdgeLogicalInterpretationChange - class_class_curie: ClassVar[str] = "kgcl:EdgeLogicalInterpretationChange" + class_class_curie: ClassVar[str] = "kgcl_schema:EdgeLogicalInterpretationChange" class_name: ClassVar[str] = "edge logical interpretation change" class_model_uri: ClassVar[URIRef] = KGCL.EdgeLogicalInterpretationChange @@ -1150,7 +1150,7 @@ class LogicalAxiomChange(SimpleChange): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.LogicalAxiomChange - class_class_curie: ClassVar[str] = "kgcl:LogicalAxiomChange" + class_class_curie: ClassVar[str] = "kgcl_schema:LogicalAxiomChange" class_name: ClassVar[str] = "logical axiom change" class_model_uri: ClassVar[URIRef] = KGCL.LogicalAxiomChange @@ -1173,7 +1173,7 @@ class NodeChange(SimpleChange): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.NodeChange - class_class_curie: ClassVar[str] = "kgcl:NodeChange" + class_class_curie: ClassVar[str] = "kgcl_schema:NodeChange" class_name: ClassVar[str] = "node change" class_model_uri: ClassVar[URIRef] = KGCL.NodeChange @@ -1203,7 +1203,7 @@ class NodeRename(NodeChange): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.NodeRename - class_class_curie: ClassVar[str] = "kgcl:NodeRename" + class_class_curie: ClassVar[str] = "kgcl_schema:NodeRename" class_name: ClassVar[str] = "node rename" class_model_uri: ClassVar[URIRef] = KGCL.NodeRename @@ -1250,7 +1250,7 @@ class SetLanguageForName(NodeChange): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.SetLanguageForName - class_class_curie: ClassVar[str] = "kgcl:SetLanguageForName" + class_class_curie: ClassVar[str] = "kgcl_schema:SetLanguageForName" class_name: ClassVar[str] = "set language for name" class_model_uri: ClassVar[URIRef] = KGCL.SetLanguageForName @@ -1285,7 +1285,7 @@ class NodeAnnotationChange(NodeChange): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.NodeAnnotationChange - class_class_curie: ClassVar[str] = "kgcl:NodeAnnotationChange" + class_class_curie: ClassVar[str] = "kgcl_schema:NodeAnnotationChange" class_name: ClassVar[str] = "node annotation change" class_model_uri: ClassVar[URIRef] = KGCL.NodeAnnotationChange @@ -1316,7 +1316,7 @@ class NodeAnnotationReplacement(NodeAnnotationChange): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.NodeAnnotationReplacement - class_class_curie: ClassVar[str] = "kgcl:NodeAnnotationReplacement" + class_class_curie: ClassVar[str] = "kgcl_schema:NodeAnnotationReplacement" class_name: ClassVar[str] = "node annotation replacement" class_model_uri: ClassVar[URIRef] = KGCL.NodeAnnotationReplacement @@ -1336,7 +1336,7 @@ class NodeSynonymChange(NodeChange): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.NodeSynonymChange - class_class_curie: ClassVar[str] = "kgcl:NodeSynonymChange" + class_class_curie: ClassVar[str] = "kgcl_schema:NodeSynonymChange" class_name: ClassVar[str] = "node synonym change" class_model_uri: ClassVar[URIRef] = KGCL.NodeSynonymChange @@ -1359,7 +1359,7 @@ class NewSynonym(NodeSynonymChange): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.NewSynonym - class_class_curie: ClassVar[str] = "kgcl:NewSynonym" + class_class_curie: ClassVar[str] = "kgcl_schema:NewSynonym" class_name: ClassVar[str] = "new synonym" class_model_uri: ClassVar[URIRef] = KGCL.NewSynonym @@ -1395,7 +1395,7 @@ class NameBecomesSynonym(NodeSynonymChange): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.NameBecomesSynonym - class_class_curie: ClassVar[str] = "kgcl:NameBecomesSynonym" + class_class_curie: ClassVar[str] = "kgcl_schema:NameBecomesSynonym" class_name: ClassVar[str] = "name becomes synonym" class_model_uri: ClassVar[URIRef] = KGCL.NameBecomesSynonym @@ -1430,7 +1430,7 @@ class RemoveSynonym(NodeSynonymChange): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.RemoveSynonym - class_class_curie: ClassVar[str] = "kgcl:RemoveSynonym" + class_class_curie: ClassVar[str] = "kgcl_schema:RemoveSynonym" class_name: ClassVar[str] = "remove synonym" class_model_uri: ClassVar[URIRef] = KGCL.RemoveSynonym @@ -1457,7 +1457,7 @@ class SynonymReplacement(NodeSynonymChange): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.SynonymReplacement - class_class_curie: ClassVar[str] = "kgcl:SynonymReplacement" + class_class_curie: ClassVar[str] = "kgcl_schema:SynonymReplacement" class_name: ClassVar[str] = "synonym replacement" class_model_uri: ClassVar[URIRef] = KGCL.SynonymReplacement @@ -1494,7 +1494,7 @@ class SynonymPredicateChange(NodeSynonymChange): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.SynonymPredicateChange - class_class_curie: ClassVar[str] = "kgcl:SynonymPredicateChange" + class_class_curie: ClassVar[str] = "kgcl_schema:SynonymPredicateChange" class_name: ClassVar[str] = "synonym predicate change" class_model_uri: ClassVar[URIRef] = KGCL.SynonymPredicateChange @@ -1529,7 +1529,7 @@ class NodeTextDefinitionChange(NodeChange): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.NodeTextDefinitionChange - class_class_curie: ClassVar[str] = "kgcl:NodeTextDefinitionChange" + class_class_curie: ClassVar[str] = "kgcl_schema:NodeTextDefinitionChange" class_name: ClassVar[str] = "node text definition change" class_model_uri: ClassVar[URIRef] = KGCL.NodeTextDefinitionChange @@ -1543,7 +1543,7 @@ class NewTextDefinition(NodeTextDefinitionChange): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.NewTextDefinition - class_class_curie: ClassVar[str] = "kgcl:NewTextDefinition" + class_class_curie: ClassVar[str] = "kgcl_schema:NewTextDefinition" class_name: ClassVar[str] = "new text definition" class_model_uri: ClassVar[URIRef] = KGCL.NewTextDefinition @@ -1570,7 +1570,7 @@ class RemoveTextDefinition(NodeTextDefinitionChange): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.RemoveTextDefinition - class_class_curie: ClassVar[str] = "kgcl:RemoveTextDefinition" + class_class_curie: ClassVar[str] = "kgcl_schema:RemoveTextDefinition" class_name: ClassVar[str] = "remove text definition" class_model_uri: ClassVar[URIRef] = KGCL.RemoveTextDefinition @@ -1597,7 +1597,7 @@ class TextDefinitionReplacement(NodeTextDefinitionChange): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.TextDefinitionReplacement - class_class_curie: ClassVar[str] = "kgcl:TextDefinitionReplacement" + class_class_curie: ClassVar[str] = "kgcl_schema:TextDefinitionReplacement" class_name: ClassVar[str] = "text definition replacement" class_model_uri: ClassVar[URIRef] = KGCL.TextDefinitionReplacement @@ -1632,7 +1632,7 @@ class AddNodeToSubset(NodeChange): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.AddNodeToSubset - class_class_curie: ClassVar[str] = "kgcl:AddNodeToSubset" + class_class_curie: ClassVar[str] = "kgcl_schema:AddNodeToSubset" class_name: ClassVar[str] = "add node to subset" class_model_uri: ClassVar[URIRef] = KGCL.AddNodeToSubset @@ -1659,7 +1659,7 @@ class RemovedNodeFromSubset(NodeChange): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.RemovedNodeFromSubset - class_class_curie: ClassVar[str] = "kgcl:RemovedNodeFromSubset" + class_class_curie: ClassVar[str] = "kgcl_schema:RemovedNodeFromSubset" class_name: ClassVar[str] = "removed node from subset" class_model_uri: ClassVar[URIRef] = KGCL.RemovedNodeFromSubset @@ -1698,7 +1698,7 @@ class NodeObsoletion(NodeChange): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.NodeObsoletion - class_class_curie: ClassVar[str] = "kgcl:NodeObsoletion" + class_class_curie: ClassVar[str] = "kgcl_schema:NodeObsoletion" class_name: ClassVar[str] = "node obsoletion" class_model_uri: ClassVar[URIRef] = KGCL.NodeObsoletion @@ -1741,7 +1741,7 @@ class NodeUnobsoletion(NodeChange): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.NodeUnobsoletion - class_class_curie: ClassVar[str] = "kgcl:NodeUnobsoletion" + class_class_curie: ClassVar[str] = "kgcl_schema:NodeUnobsoletion" class_name: ClassVar[str] = "node unobsoletion" class_model_uri: ClassVar[URIRef] = KGCL.NodeUnobsoletion @@ -1776,7 +1776,7 @@ class NodeCreation(NodeChange): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.NodeCreation - class_class_curie: ClassVar[str] = "kgcl:NodeCreation" + class_class_curie: ClassVar[str] = "kgcl_schema:NodeCreation" class_name: ClassVar[str] = "node creation" class_model_uri: ClassVar[URIRef] = KGCL.NodeCreation @@ -1823,7 +1823,7 @@ class ClassCreation(NodeCreation): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.ClassCreation - class_class_curie: ClassVar[str] = "kgcl:ClassCreation" + class_class_curie: ClassVar[str] = "kgcl_schema:ClassCreation" class_name: ClassVar[str] = "class creation" class_model_uri: ClassVar[URIRef] = KGCL.ClassCreation @@ -1855,7 +1855,7 @@ class NodeDeletion(NodeChange): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.NodeDeletion - class_class_curie: ClassVar[str] = "kgcl:NodeDeletion" + class_class_curie: ClassVar[str] = "kgcl_schema:NodeDeletion" class_name: ClassVar[str] = "node deletion" class_model_uri: ClassVar[URIRef] = KGCL.NodeDeletion @@ -1883,7 +1883,7 @@ class NodeDirectMerge(NodeObsoletion): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.NodeDirectMerge - class_class_curie: ClassVar[str] = "kgcl:NodeDirectMerge" + class_class_curie: ClassVar[str] = "kgcl_schema:NodeDirectMerge" class_name: ClassVar[str] = "node direct merge" class_model_uri: ClassVar[URIRef] = KGCL.NodeDirectMerge @@ -1921,7 +1921,7 @@ class NodeObsoletionWithDirectReplacement(NodeObsoletion): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.NodeObsoletionWithDirectReplacement - class_class_curie: ClassVar[str] = "kgcl:NodeObsoletionWithDirectReplacement" + class_class_curie: ClassVar[str] = "kgcl_schema:NodeObsoletionWithDirectReplacement" class_name: ClassVar[str] = "node obsoletion with direct replacement" class_model_uri: ClassVar[URIRef] = KGCL.NodeObsoletionWithDirectReplacement @@ -1954,7 +1954,7 @@ class NodeObsoletionWithNoDirectReplacement(NodeObsoletion): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.NodeObsoletionWithNoDirectReplacement - class_class_curie: ClassVar[str] = "kgcl:NodeObsoletionWithNoDirectReplacement" + class_class_curie: ClassVar[str] = "kgcl_schema:NodeObsoletionWithNoDirectReplacement" class_name: ClassVar[str] = "node obsoletion with no direct replacement" class_model_uri: ClassVar[URIRef] = KGCL.NodeObsoletionWithNoDirectReplacement @@ -1987,7 +1987,7 @@ class TextualDiff(YAMLRoot): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.TextualDiff - class_class_curie: ClassVar[str] = "kgcl:TextualDiff" + class_class_curie: ClassVar[str] = "kgcl_schema:TextualDiff" class_name: ClassVar[str] = "textual diff" class_model_uri: ClassVar[URIRef] = KGCL.TextualDiff @@ -2000,7 +2000,7 @@ class Configuration(YAMLRoot): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.Configuration - class_class_curie: ClassVar[str] = "kgcl:Configuration" + class_class_curie: ClassVar[str] = "kgcl_schema:Configuration" class_name: ClassVar[str] = "configuration" class_model_uri: ClassVar[URIRef] = KGCL.Configuration @@ -2049,7 +2049,7 @@ class Session(YAMLRoot): _inherited_slots: ClassVar[List[str]] = [] class_class_uri: ClassVar[URIRef] = KGCL.Session - class_class_curie: ClassVar[str] = "kgcl:Session" + class_class_curie: ClassVar[str] = "kgcl_schema:Session" class_name: ClassVar[str] = "session" class_model_uri: ClassVar[URIRef] = KGCL.Session diff --git a/src/kgcl/datamodel/ontology_model.py b/src/kgcl_schema/datamodel/ontology_model.py similarity index 99% rename from src/kgcl/datamodel/ontology_model.py rename to src/kgcl_schema/datamodel/ontology_model.py index 42f0bf10..2485ca82 100644 --- a/src/kgcl/datamodel/ontology_model.py +++ b/src/kgcl_schema/datamodel/ontology_model.py @@ -1,6 +1,6 @@ # Auto generated from ontology_model.yaml by pythongen.py version: 0.9.0 # Generation date: 2022-06-30T15:03:19 -# Schema: kgcl-ontology-model +# Schema: kgcl_schema-ontology-model # # id: https://w3id.org/kgcl/ontology # description: A basic bare-bones model of an ontology or ontology-like structure. The purpose is not to provide a diff --git a/src/kgcl/diff/__init__.py b/src/kgcl_schema/diff/__init__.py similarity index 100% rename from src/kgcl/diff/__init__.py rename to src/kgcl_schema/diff/__init__.py diff --git a/src/kgcl/diff/change_detection.py b/src/kgcl_schema/diff/change_detection.py similarity index 98% rename from src/kgcl/diff/change_detection.py rename to src/kgcl_schema/diff/change_detection.py index 4f41e869..82088cca 100644 --- a/src/kgcl/diff/change_detection.py +++ b/src/kgcl_schema/diff/change_detection.py @@ -3,9 +3,9 @@ from rdflib import Literal, URIRef from rdflib.namespace import RDFS -from kgcl.datamodel.kgcl import (NodeAnnotationChange, NodeMove, NodeRename, - PredicateChange) -from kgcl.datamodel.ontology_model import Edge +from kgcl_schema.datamodel.kgcl import (NodeAnnotationChange, NodeMove, NodeRename, + PredicateChange) +from kgcl_schema.datamodel.ontology_model import Edge def id_generator(): @@ -109,7 +109,7 @@ def detect_annotation_changes(added, deleted, new_annotations, old_annotations): :param deleted: Deleted node. :param new_annotations: new annotations. :param old_annotations: old annotations. - :return: Tuple(kgcl, covered, non_deterministic) + :return: Tuple(kgcl_schema, covered, non_deterministic) """ covered = rdflib.Graph() diff --git a/src/kgcl/diff/diff_2_kgcl_existential.py b/src/kgcl_schema/diff/diff_2_kgcl_existential.py similarity index 95% rename from src/kgcl/diff/diff_2_kgcl_existential.py rename to src/kgcl_schema/diff/diff_2_kgcl_existential.py index 01d3fc4e..54814792 100644 --- a/src/kgcl/diff/diff_2_kgcl_existential.py +++ b/src/kgcl_schema/diff/diff_2_kgcl_existential.py @@ -2,10 +2,10 @@ import rdflib -from kgcl.diff.graph_diff import (get_added_existentials, - get_deleted_existentials) -from kgcl.diff.render_operations import render -from kgcl.datamodel.kgcl import EdgeCreation, EdgeDeletion +from kgcl_schema.diff.graph_diff import (get_added_existentials, + get_deleted_existentials) +from kgcl_schema.diff.render_operations import render +from kgcl_schema.datamodel.kgcl import EdgeCreation, EdgeDeletion def id_generator(): diff --git a/src/kgcl/diff/diff_2_kgcl_single.py b/src/kgcl_schema/diff/diff_2_kgcl_single.py similarity index 97% rename from src/kgcl/diff/diff_2_kgcl_single.py rename to src/kgcl_schema/diff/diff_2_kgcl_single.py index d9161488..7f5b123b 100644 --- a/src/kgcl/diff/diff_2_kgcl_single.py +++ b/src/kgcl_schema/diff/diff_2_kgcl_single.py @@ -3,14 +3,14 @@ from rdflib import Graph, Literal, URIRef from rdflib.namespace import OWL, RDF, RDFS -from kgcl.diff.change_detection import (detect_annotation_changes, - detect_node_moves, - detect_predicate_changes, - detect_renamings) -from kgcl.diff.graph_diff import (get_added_thin_triples, - get_deleted_thin_triples) -from kgcl.diff.render_operations import render -from kgcl.datamodel.kgcl import ClassCreation, NewSynonym, PlaceUnder, RemoveUnder +from kgcl_schema.diff.change_detection import (detect_annotation_changes, + detect_node_moves, + detect_predicate_changes, + detect_renamings) +from kgcl_schema.diff.graph_diff import (get_added_thin_triples, + get_deleted_thin_triples) +from kgcl_schema.diff.render_operations import render +from kgcl_schema.datamodel.kgcl import ClassCreation, NewSynonym, PlaceUnder, RemoveUnder def id_generator(): diff --git a/src/kgcl/diff/diff_2_kgcl_triple_annotation.py b/src/kgcl_schema/diff/diff_2_kgcl_triple_annotation.py similarity index 95% rename from src/kgcl/diff/diff_2_kgcl_triple_annotation.py rename to src/kgcl_schema/diff/diff_2_kgcl_triple_annotation.py index 0f0f98c4..0f1b13ab 100644 --- a/src/kgcl/diff/diff_2_kgcl_triple_annotation.py +++ b/src/kgcl_schema/diff/diff_2_kgcl_triple_annotation.py @@ -2,11 +2,11 @@ import rdflib from rdflib import Graph, Literal, URIRef -from kgcl.diff.graph_diff import (get_added_triple_annotations, - get_deleted_triple_annotations) -from kgcl.diff.render_operations import render -from kgcl.datamodel.kgcl import EdgeCreation, EdgeDeletion -from kgcl.datamodel.ontology_model import Annotation +from kgcl_schema.diff.graph_diff import (get_added_triple_annotations, + get_deleted_triple_annotations) +from kgcl_schema.diff.render_operations import render +from kgcl_schema.datamodel.kgcl import EdgeCreation, EdgeDeletion +from kgcl_schema.datamodel.ontology_model import Annotation def id_generator(): diff --git a/src/kgcl/diff/graph_diff.py b/src/kgcl_schema/diff/graph_diff.py similarity index 100% rename from src/kgcl/diff/graph_diff.py rename to src/kgcl_schema/diff/graph_diff.py diff --git a/src/kgcl/diff/owlstar_sublanguage.py b/src/kgcl_schema/diff/owlstar_sublanguage.py similarity index 100% rename from src/kgcl/diff/owlstar_sublanguage.py rename to src/kgcl_schema/diff/owlstar_sublanguage.py diff --git a/src/kgcl/diff/pretty_print_kgcl.py b/src/kgcl_schema/diff/pretty_print_kgcl.py similarity index 95% rename from src/kgcl/diff/pretty_print_kgcl.py rename to src/kgcl_schema/diff/pretty_print_kgcl.py index 599e9a2d..fa98dcdb 100644 --- a/src/kgcl/diff/pretty_print_kgcl.py +++ b/src/kgcl_schema/diff/pretty_print_kgcl.py @@ -1,12 +1,12 @@ """Print KGCL in user-friendly format.""" from rdflib.namespace import RDFS -import kgcl.grammar.parser -from kgcl.datamodel.kgcl import (ClassCreation, EdgeCreation, EdgeDeletion, - NewSynonym, NodeAnnotationChange, NodeCreation, - NodeDeletion, NodeMove, NodeObsoletion, - NodeRename, NodeUnobsoletion, PlaceUnder, - PredicateChange, RemoveUnder) +import kgcl_schema.grammar.parser +from kgcl_schema.datamodel.kgcl import (ClassCreation, EdgeCreation, EdgeDeletion, + NewSynonym, NodeAnnotationChange, NodeCreation, + NodeDeletion, NodeMove, NodeObsoletion, + NodeRename, NodeUnobsoletion, PlaceUnder, + PredicateChange, RemoveUnder) # TODO: maintain this dictionary in a file prefix_2_uri = { @@ -64,7 +64,7 @@ def render_instances(kgcl_patch, graph): pretty_print_kgcl_patch = [] for k in kgcl_patch: - kgcl_instance = kgcl.grammar.parser.parse_statement(k) + kgcl_instance = kgcl_schema.grammar.parser.parse_statement(k) # render_instance(kgcl_instance, labelling) pretty_print_kgcl_patch.append(render_instance(kgcl_instance, labelling)) diff --git a/src/kgcl/diff/render_operations.py b/src/kgcl_schema/diff/render_operations.py similarity index 94% rename from src/kgcl/diff/render_operations.py rename to src/kgcl_schema/diff/render_operations.py index 24c85334..996c1f7d 100644 --- a/src/kgcl/diff/render_operations.py +++ b/src/kgcl_schema/diff/render_operations.py @@ -1,11 +1,11 @@ """Render operations.""" # TODO: move this to grammar package -from kgcl.datamodel.kgcl import (ClassCreation, EdgeCreation, EdgeDeletion, - NewSynonym, NodeAnnotationChange, NodeCreation, - NodeDeletion, NodeMove, NodeObsoletion, - NodeRename, NodeUnobsoletion, PlaceUnder, - PredicateChange, RemoveUnder, Change) +from kgcl_schema.datamodel.kgcl import (ClassCreation, EdgeCreation, EdgeDeletion, + NewSynonym, NodeAnnotationChange, NodeCreation, + NodeDeletion, NodeMove, NodeObsoletion, + NodeRename, NodeUnobsoletion, PlaceUnder, + PredicateChange, RemoveUnder, Change) # TODO: replace this with rdflib methods diff --git a/src/kgcl/diff/summary_generation.py b/src/kgcl_schema/diff/summary_generation.py similarity index 94% rename from src/kgcl/diff/summary_generation.py rename to src/kgcl_schema/diff/summary_generation.py index dfac8545..dd06e2a7 100644 --- a/src/kgcl/diff/summary_generation.py +++ b/src/kgcl_schema/diff/summary_generation.py @@ -5,9 +5,9 @@ import rdflib from rdflib.util import guess_format -import kgcl.diff.diff_2_kgcl_existential as existential -import kgcl.diff.diff_2_kgcl_single as single -from kgcl.diff.pretty_print_kgcl import render_instances +import kgcl_schema.diff.diff_2_kgcl_existential as existential +import kgcl_schema.diff.diff_2_kgcl_single as single +from kgcl_schema.diff.pretty_print_kgcl import render_instances def ts(): @@ -68,7 +68,7 @@ def run(ingraph, outgraph, output): kgcl_commands += single_triple_summary.get_commands() # write KGCL commands - with open(output + "/patch.kgcl", "w") as f: + with open(output + "/patch.kgcl_schema", "w") as f: for k in kgcl_commands: f.write(k) f.write("\n") @@ -129,7 +129,7 @@ def run(ingraph, outgraph, output): # TODO pretty printing pp_kgcl_commands = render_instances(kgcl_commands, g1) - with open(output + "/pp_patch.kgcl", "w") as f: + with open(output + "/pp_patch.kgcl_schema", "w") as f: for a in pp_kgcl_commands: f.write(a) f.write("\n") diff --git a/src/kgcl/grammar/__init__.py b/src/kgcl_schema/grammar/__init__.py similarity index 100% rename from src/kgcl/grammar/__init__.py rename to src/kgcl_schema/grammar/__init__.py diff --git a/src/kgcl/grammar/kgcl.lark b/src/kgcl_schema/grammar/kgcl.lark similarity index 100% rename from src/kgcl/grammar/kgcl.lark rename to src/kgcl_schema/grammar/kgcl.lark diff --git a/src/kgcl/grammar/kgcl_2_rdf.py b/src/kgcl_schema/grammar/kgcl_2_rdf.py similarity index 96% rename from src/kgcl/grammar/kgcl_2_rdf.py rename to src/kgcl_schema/grammar/kgcl_2_rdf.py index acc0dbb4..ac89906d 100644 --- a/src/kgcl/grammar/kgcl_2_rdf.py +++ b/src/kgcl_schema/grammar/kgcl_2_rdf.py @@ -2,15 +2,15 @@ """KGCL RDF-related operations.""" from deprecated.classic import deprecated -from kgcl.grammar.parser import parse -from kgcl.datamodel.kgcl import (ClassCreation, EdgeCreation, EdgeDeletion, - NewSynonym, NodeAnnotationChange, NodeCreation, - NodeDeepening, NodeDeletion, NodeMove, - NodeObsoletion, NodeRename, NodeShallowing, - NodeUnobsoletion, PlaceUnder, PredicateChange, - RemoveUnder) - -# parse kgcl to python data class +from kgcl_schema.grammar.parser import parse +from kgcl_schema.datamodel.kgcl import (ClassCreation, EdgeCreation, EdgeDeletion, + NewSynonym, NodeAnnotationChange, NodeCreation, + NodeDeepening, NodeDeletion, NodeMove, + NodeObsoletion, NodeRename, NodeShallowing, + NodeUnobsoletion, PlaceUnder, PredicateChange, + RemoveUnder) + +# parse kgcl_schema to python data class # serialse puython data class to yaml # convert python data class to RDF diff --git a/src/kgcl/grammar/parser.py b/src/kgcl_schema/grammar/parser.py similarity index 95% rename from src/kgcl/grammar/parser.py rename to src/kgcl_schema/grammar/parser.py index 56ac61be..ca136d21 100644 --- a/src/kgcl/grammar/parser.py +++ b/src/kgcl_schema/grammar/parser.py @@ -5,17 +5,16 @@ from typing import List import click -from kgcl.utils import to_json, to_rdf, to_yaml +from kgcl_schema.utils import to_json, to_rdf, to_yaml from lark import Lark, Token -from kgcl.datamodel.kgcl import (ClassCreation, EdgeCreation, EdgeDeletion, - NewSynonym, NodeAnnotationChange, NodeCreation, - NodeDeepening, NodeDeletion, NodeMove, - NodeObsoletion, NodeRename, NodeShallowing, - NodeUnobsoletion, PlaceUnder, PredicateChange, - RemovedNodeFromSubset, RemoveUnder, Change, Session) -from kgcl.datamodel.ontology_model import Edge -from linkml_runtime.dumpers import yaml_dumper, json_dumper +from kgcl_schema.datamodel.kgcl import (ClassCreation, EdgeCreation, EdgeDeletion, + NewSynonym, NodeAnnotationChange, NodeCreation, + NodeDeepening, NodeDeletion, NodeMove, + NodeObsoletion, NodeRename, NodeShallowing, + NodeUnobsoletion, PlaceUnder, PredicateChange, + RemovedNodeFromSubset, RemoveUnder, Change, Session) +from kgcl_schema.datamodel.ontology_model import Edge def id_generator(): @@ -39,7 +38,7 @@ def parse(input: str) -> List[Change]: """ Parse a set of KGCL command separated by next-line operator. - Returns instantiated dataclass objects from model.kgcl. + Returns instantiated dataclass objects from model.kgcl_schema. """ statements = input.splitlines() parsed = [] @@ -53,7 +52,7 @@ def parse_statement(input: str) -> Change: """ Parse a KGCL command. - Return an instantiated dataclass object from model.kgcl. + Return an instantiated dataclass object from model.kgcl_schema. """ tree = kgcl_parser.parse(input) id = "kgcl_change_id_" + str(next(id_gen)) @@ -540,7 +539,7 @@ def cli(patches, verbose: int, output, output_type): else: logging.basicConfig(level=logging.WARNING) - # parser kgcl commands + # parser kgcl_schema commands changes = [] for patch in patches: logging.info(f"Patch: {patch}") diff --git a/src/kgcl/kgcl.py b/src/kgcl_schema/kgcl.py similarity index 80% rename from src/kgcl/kgcl.py rename to src/kgcl_schema/kgcl.py index c83fe2d7..743d7cfa 100644 --- a/src/kgcl/kgcl.py +++ b/src/kgcl_schema/kgcl.py @@ -6,8 +6,8 @@ import rdflib from rdflib.util import guess_format -from kgcl.apply import graph_transformer -from kgcl.grammar import parser +from kgcl_schema.apply import graph_transformer +from kgcl_schema.grammar import parser # TODO: remove this sys.path.append("../") @@ -32,19 +32,19 @@ def cli(patch, verbose: int, graph, kgcl_file, output): logging.basicConfig(level=logging.INFO) else: logging.basicConfig(level=logging.WARNING) - # read kgcl commands from file + # read kgcl_schema commands from file if kgcl_file: kgcl_patch = kgcl_file.read() elif patch: kgcl_patch = patch else: - raise ValueError(f"Must pass EITHER kgcl-file OR kgcl") + raise ValueError(f"Must pass EITHER kgcl_schema-file OR kgcl_schema") - # parser kgcl commands + # parser kgcl_schema commands parsed_patch = parser.parse(kgcl_patch) logging.info(f"Patch: {patch}") - # apply kgcl commands as SPARQL UPDATE queries to graph + # apply kgcl_schema commands as SPARQL UPDATE queries to graph g = rdflib.Graph() g.load(graph, format=guess_format(graph)) # g.parse(graph) # , format="nt") #TODO: this doesn't always work diff --git a/src/kgcl/kgcl_diff.py b/src/kgcl_schema/kgcl_diff.py similarity index 96% rename from src/kgcl/kgcl_diff.py rename to src/kgcl_schema/kgcl_diff.py index 1dfab8d0..b2ef7b48 100644 --- a/src/kgcl/kgcl_diff.py +++ b/src/kgcl_schema/kgcl_diff.py @@ -7,13 +7,13 @@ from typing import List import click -import kgcl.diff.diff_2_kgcl_existential as existential -import kgcl.diff.diff_2_kgcl_single as single -import kgcl.diff.diff_2_kgcl_triple_annotation as annotation +import kgcl_schema.diff.diff_2_kgcl_existential as existential +import kgcl_schema.diff.diff_2_kgcl_single as single +import kgcl_schema.diff.diff_2_kgcl_triple_annotation as annotation import rdflib -from kgcl.datamodel.kgcl import Change +from kgcl_schema.datamodel.kgcl import Change -from kgcl.diff.pretty_print_kgcl import render_instances +from kgcl_schema.diff.pretty_print_kgcl import render_instances def ts(): diff --git a/src/kgcl/schema/__init__.py b/src/kgcl_schema/schema/__init__.py similarity index 100% rename from src/kgcl/schema/__init__.py rename to src/kgcl_schema/schema/__init__.py diff --git a/src/kgcl/schema/basics.yaml b/src/kgcl_schema/schema/basics.yaml similarity index 83% rename from src/kgcl/schema/basics.yaml rename to src/kgcl_schema/schema/basics.yaml index 644e0e99..eb258883 100644 --- a/src/kgcl/schema/basics.yaml +++ b/src/kgcl_schema/schema/basics.yaml @@ -1,4 +1,4 @@ -id: https://w3id.org/kgcl/basics +id: https://w3id.org/kgcl_schema/basics name: basics title: basic predicates description: >- @@ -6,7 +6,7 @@ description: >- license: https://creativecommons.org/publicdomain/zero/1.0/ prefixes: - basics: https://w3id.org/kgcl/basics/ + basics: https://w3id.org/kgcl_schema/basics/ linkml: https://w3id.org/linkml/ default_prefix: basics diff --git a/src/kgcl/schema/kgcl.yaml b/src/kgcl_schema/schema/kgcl.yaml similarity index 99% rename from src/kgcl/schema/kgcl.yaml rename to src/kgcl_schema/schema/kgcl.yaml index 0ad960ca..dda9ac91 100644 --- a/src/kgcl/schema/kgcl.yaml +++ b/src/kgcl_schema/schema/kgcl.yaml @@ -1,5 +1,5 @@ -id: https://w3id.org/kgcl -name: kgcl +id: https://w3id.org/kgcl_schema +name: kgcl_schema title: Knowledge Graph Change Language description: |- A data model for describing change operations at a high level on an ontology or ontology-like artefact, such as a Knowledge Graph. @@ -11,14 +11,14 @@ license: https://creativecommons.org/publicdomain/zero/1.0/ version: 0.0.1 prefixes: - kgcl: http://w3id.org/kgcl/ + kgcl: http://w3id.org/kgcl_schema/ dcterms: http://purl.org/dc/terms/ IAO: http://purl.obolibrary.org/obo/IAO_ oio: "http://www.geneontology.org/formats/oboInOwl#" xml: http://www.w3.org/XML/1998/namespace# linkml: https://w3id.org/linkml/ -default_prefix: kgcl +default_prefix: kgcl_schema default_range: string imports: diff --git a/src/kgcl/schema/ontology_model.yaml b/src/kgcl_schema/schema/ontology_model.yaml similarity index 97% rename from src/kgcl/schema/ontology_model.yaml rename to src/kgcl_schema/schema/ontology_model.yaml index 0987aa1d..62ccd217 100644 --- a/src/kgcl/schema/ontology_model.yaml +++ b/src/kgcl_schema/schema/ontology_model.yaml @@ -1,5 +1,5 @@ -id: https://w3id.org/kgcl/ontology -name: kgcl-ontology-model +id: https://w3id.org/kgcl_schema/ontology +name: kgcl_schema-ontology-model title: knowledge graph change language ontology model description: >- A basic bare-bones model of an ontology or ontology-like structure. The purpose is not to provide a complete model, @@ -9,7 +9,7 @@ license: https://creativecommons.org/publicdomain/zero/1.0/ version: 0.0.1 prefixes: - om: http://w3id.org/kgcl/om/ + om: http://w3id.org/kgcl_schema/om/ dcterms: http://purl.org/dc/terms/ linkml: https://w3id.org/linkml/ oio: http://www.geneontology.org/formats/oboInOwl# diff --git a/src/kgcl/schema/prov.yaml b/src/kgcl_schema/schema/prov.yaml similarity index 97% rename from src/kgcl/schema/prov.yaml rename to src/kgcl_schema/schema/prov.yaml index acb07e09..cc14f5be 100644 --- a/src/kgcl/schema/prov.yaml +++ b/src/kgcl_schema/schema/prov.yaml @@ -1,4 +1,4 @@ -id: https://w3id.org/kgcl/prov +id: https://w3id.org/kgcl_schema/prov name: KGCL-PROV title: KGCL Rendering of prov schema description: >- diff --git a/src/kgcl/utils.py b/src/kgcl_schema/utils.py similarity index 93% rename from src/kgcl/utils.py rename to src/kgcl_schema/utils.py index dd1c3aa0..fc640455 100644 --- a/src/kgcl/utils.py +++ b/src/kgcl_schema/utils.py @@ -13,7 +13,7 @@ import click import yaml -from kgcl.schema import get_schemaview +from kgcl_schema.schema import get_schemaview from linkml_runtime.dumpers import json_dumper, yaml_dumper, rdflib_dumper from linkml_runtime.dumpers.json_dumper import JSONDumper from linkml_runtime.dumpers.rdf_dumper import RDFDumper @@ -22,13 +22,13 @@ from linkml_runtime.utils.yamlutils import YAMLRoot from rdflib import Graph -import kgcl.datamodel as model -from kgcl.datamodel.kgcl import Session, Change -from kgcl.datamodel.kgcl import Activity +import kgcl_schema.datamodel as model +from kgcl_schema.datamodel.kgcl import Session, Change +from kgcl_schema.datamodel.kgcl import Activity from os.path import dirname, join # THIS_DIR = os.path.abspath(os.path.dirname(__file__)) -# LD = os.path.join(THIS_DIR, "../ldcontext/kgcl.context.jsonld") +# LD = os.path.join(THIS_DIR, "../ldcontext/kgcl_schema.context.jsonld") LD = join(dirname(dirname(dirname(__file__))),"ldcontext/kgcl.context.jsonld") def get_context() -> str: @@ -114,7 +114,7 @@ def from_dict(obj: Dict[str, Any]) -> Session: typ = getattr(model.kgcl, tc) logging.info(f"Converting type {tc} // {c}") chg = typ(**c) - chg.type = f"kgcl:{tc}" + chg.type = f"kgcl_schema:{tc}" session.change_set.append(chg) return session diff --git a/tests/__init__.py b/tests/__init__.py index de0d294f..5e21823f 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -14,6 +14,6 @@ INPUT = os.path.join(INPUT_DIR, 'go-nucleus.owl.ttl') TMP_OUTPUT = os.path.join(OUTPUT_DIR, 'go-nucleus-modified.owl.ttl') TMP_YAML = os.path.join(OUTPUT_DIR, 'tmp.yaml') -DIFF_OUTPUT = os.path.join(OUTPUT_DIR, 'diff.kgcl') +DIFF_OUTPUT = os.path.join(OUTPUT_DIR, 'diff.kgcl_schema') DIFF_OUTPUT_DIR = os.path.join(OUTPUT_DIR, 'diff-info') diff --git a/tests/cases.py b/tests/cases.py index 35ab65d0..edfec7d6 100644 --- a/tests/cases.py +++ b/tests/cases.py @@ -1,8 +1,8 @@ from typing import Tuple, Optional, List, Union -from kgcl.datamodel.kgcl import NodeRename, NodeObsoletion, NewSynonym, ClassCreation, PredicateChange, Change, \ +from kgcl_schema.datamodel.kgcl import NodeRename, NodeObsoletion, NewSynonym, ClassCreation, PredicateChange, Change, \ NodeCreation, EdgeCreation, PlaceUnder, RemoveUnder, EdgeDeletion, NodeDeepening -from kgcl.datamodel.ontology_model import Edge +from kgcl_schema.datamodel.ontology_model import Edge TODO_TOKEN = "TODO" PART_OF = "BFO:0000050" diff --git a/tests/test_cli/test_cli.py b/tests/test_cli/test_cli.py index 67650d12..4a98df46 100644 --- a/tests/test_cli/test_cli.py +++ b/tests/test_cli/test_cli.py @@ -4,11 +4,11 @@ import rdflib from click.testing import CliRunner -import kgcl.kgcl as kgcl_apply -import kgcl.kgcl_diff as kgcl_diff -import kgcl.grammar.parser as kgcl_parser -from kgcl.datamodel.kgcl import Session -from kgcl.utils import from_yaml +import kgcl_schema.kgcl as kgcl_apply +import kgcl_schema.kgcl_diff as kgcl_diff +import kgcl_schema.grammar.parser as kgcl_parser +from kgcl_schema.datamodel.kgcl import Session +from kgcl_schema.utils import from_yaml from tests import INPUT, TMP_OUTPUT, DIFF_OUTPUT, DIFF_OUTPUT_DIR, TMP_YAML from tests.cases import CASES, TODO_TOKEN, UID diff --git a/tests/test_diff/test_diff.py b/tests/test_diff/test_diff.py index 9d7afd7a..4f1951ec 100644 --- a/tests/test_diff/test_diff.py +++ b/tests/test_diff/test_diff.py @@ -2,9 +2,9 @@ import unittest import rdflib -from kgcl.apply import graph_transformer -from kgcl.grammar import parser -from kgcl.kgcl_diff import diff +from kgcl_schema.apply import graph_transformer +from kgcl_schema.grammar import parser +from kgcl_schema.kgcl_diff import diff from rdflib.util import guess_format from tests import INPUT diff --git a/tests/test_grammar/test_parse.py b/tests/test_grammar/test_parse.py index dc9e8b24..b8a5cba9 100644 --- a/tests/test_grammar/test_parse.py +++ b/tests/test_grammar/test_parse.py @@ -1,7 +1,7 @@ import unittest -from kgcl.grammar.parser import parse_statement -from kgcl.schema import get_schemaview +from kgcl_schema.grammar.parser import parse_statement +from kgcl_schema.schema import get_schemaview from linkml_runtime.dumpers import yaml_dumper, json_dumper from linkml_runtime.utils.inference_utils import infer_slot_value, infer_all_slot_values diff --git a/tests/test_grammar/test_render.py b/tests/test_grammar/test_render.py index f38fcc59..4b509984 100644 --- a/tests/test_grammar/test_render.py +++ b/tests/test_grammar/test_render.py @@ -1,8 +1,8 @@ import unittest -from kgcl.diff.render_operations import render -from kgcl.grammar.parser import parse_statement -from kgcl.schema import get_schemaview +from kgcl_schema.diff.render_operations import render +from kgcl_schema.grammar.parser import parse_statement +from kgcl_schema.schema import get_schemaview from linkml_runtime.dumpers import yaml_dumper, json_dumper from linkml_runtime.utils.inference_utils import infer_slot_value, infer_all_slot_values diff --git a/tests/test_model/test_change_model.py b/tests/test_model/test_change_model.py index 23adfa3a..dcebc6aa 100644 --- a/tests/test_model/test_change_model.py +++ b/tests/test_model/test_change_model.py @@ -4,8 +4,8 @@ from linkml_runtime.dumpers import JSONDumper -from kgcl.datamodel.kgcl import NewSynonym, PredicateChange -from kgcl.datamodel.ontology_model import Edge +from kgcl_schema.datamodel.kgcl import NewSynonym, PredicateChange +from kgcl_schema.datamodel.ontology_model import Edge from tests.util import roundtrip diff --git a/tests/test_model/test_conversion.py b/tests/test_model/test_conversion.py index 2970ff62..2338e043 100644 --- a/tests/test_model/test_conversion.py +++ b/tests/test_model/test_conversion.py @@ -5,12 +5,12 @@ from collections import defaultdict from typing import List, Dict -from kgcl.datamodel.kgcl import SetLanguageForName +from kgcl_schema.datamodel.kgcl import SetLanguageForName from linkml_runtime.linkml_model import ClassDefinitionName from linkml_runtime.utils.yamlutils import YAMLRoot from rdflib import Graph -from kgcl.utils import from_yaml, to_json, to_jsonld, to_rdf +from kgcl_schema.utils import from_yaml, to_json, to_jsonld, to_rdf # from test import EXAMPLE_DIR from tests.util import roundtrip diff --git a/tests/test_model/test_introspect.py b/tests/test_model/test_introspect.py index af24bd75..8fdf4552 100644 --- a/tests/test_model/test_introspect.py +++ b/tests/test_model/test_introspect.py @@ -2,7 +2,7 @@ import os import unittest -from kgcl.schema import get_schemaview +from kgcl_schema.schema import get_schemaview from linkml_runtime.dumpers import JSONDumper class IntrospectionTestSuite(unittest.TestCase): diff --git a/tests/test_model/test_ontology_model.py b/tests/test_model/test_ontology_model.py index d7335f0b..4d857e0f 100644 --- a/tests/test_model/test_ontology_model.py +++ b/tests/test_model/test_ontology_model.py @@ -4,7 +4,7 @@ from linkml_runtime.dumpers import JSONDumper, json_dumper -from kgcl.datamodel.ontology_model import ClassNode, OwlTypeEnum +from kgcl_schema.datamodel.ontology_model import ClassNode, OwlTypeEnum from linkml_runtime.loaders import json_loader from tests.util import roundtrip diff --git a/tests/util.py b/tests/util.py index 30051e41..8d763783 100644 --- a/tests/util.py +++ b/tests/util.py @@ -5,8 +5,8 @@ from rdflib import Graph from rdflib.compare import graph_diff, to_isomorphic -from kgcl.apply.graph_transformer import apply_patch -from kgcl.grammar.parser import parse +from kgcl_schema.apply.graph_transformer import apply_patch +from kgcl_schema.grammar.parser import parse def compare_graphs(actual, expected):