Skip to content

Commit b2206a4

Browse files
authored
Merge pull request #389 from ialarmedalien/schemaview_tidy
SchemaView: format, lint autofix, add typing + docs
2 parents 00abef0 + c7e1c3a commit b2206a4

File tree

9 files changed

+1088
-916
lines changed

9 files changed

+1088
-916
lines changed

linkml_runtime/dumpers/rdflib_dumper.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111

1212
from linkml_runtime.dumpers.dumper_root import Dumper
13-
from linkml_runtime.linkml_model import SlotDefinition
14-
from linkml_runtime.utils.schemaview import SchemaView, ElementName, PermissibleValue, PermissibleValueText
13+
from linkml_runtime.linkml_model import ElementName, PermissibleValue, PermissibleValueText, SlotDefinition
14+
from linkml_runtime.utils.schemaview import SchemaView
1515
from linkml_runtime.utils.yamlutils import YAMLRoot
1616

1717
logger = logging.getLogger(__name__)

linkml_runtime/index/object_index.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from typing import Any, Union
1414
from collections.abc import Mapping, Iterator
1515

16-
from linkml_runtime import SchemaView
16+
from linkml_runtime.utils.schemaview import SchemaView
1717
from linkml_runtime.utils import eval_utils
1818
from linkml_runtime.utils.yamlutils import YAMLRoot
1919

linkml_runtime/loaders/rdflib_loader.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,17 @@
1010
from rdflib.term import BNode, Literal
1111
from rdflib.namespace import RDF
1212

13-
from linkml_runtime import MappingError, DataNotFoundError
14-
from linkml_runtime.linkml_model import ClassDefinitionName, TypeDefinition, EnumDefinition, ClassDefinition
13+
from linkml_runtime import DataNotFoundError, MappingError
14+
from linkml_runtime.linkml_model import (
15+
ClassDefinition,
16+
ClassDefinitionName,
17+
EnumDefinition,
18+
SlotDefinition,
19+
TypeDefinition,
20+
)
1521
from linkml_runtime.loaders.loader_root import Loader
1622
from linkml_runtime.utils.formatutils import underscore
17-
from linkml_runtime.utils.schemaview import SchemaView, SlotDefinition
23+
from linkml_runtime.utils.schemaview import SchemaView
1824
from linkml_runtime.utils.yamlutils import YAMLRoot
1925
from pydantic import BaseModel
2026

linkml_runtime/processing/referencevalidator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import click
2020
import yaml
2121

22-
from linkml_runtime import SchemaView
22+
from linkml_runtime.utils.schemaview import SchemaView
2323
from linkml_runtime.dumpers import yaml_dumper
2424
from linkml_runtime.linkml_model import (
2525
SlotDefinition,

linkml_runtime/utils/inference_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from typing import Union, Optional, Any, Callable
55
from jsonasobj2 import JsonObj, items
66

7-
from linkml_runtime import SchemaView
7+
from linkml_runtime.utils.schemaview import SchemaView
88
from linkml_runtime.linkml_model import SlotDefinitionName, PermissibleValue, ClassDefinitionName
99
from linkml_runtime.utils.enumerations import EnumDefinitionImpl
1010
from linkml_runtime.utils.eval_utils import eval_expr

0 commit comments

Comments
 (0)