linkml 1.9.0rc1__tar.gz → 1.9.1rc3__tar.gz

{linkml-1.9.0rc1 → linkml-1.9.1rc3}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: linkml
-Version: 1.9.0rc1
+Version: 1.9.1rc3
 Summary: Linked Open Data Modeling Language
 Home-page: https://linkml.io/linkml/
 Keywords: schema,linked data,data modeling,rdf,owl,biolink
 Author: Chris Mungall
 Author-email: cjmungall@lbl.gov
-Requires-Python: >=3.8.1,<4.0.0
+Requires-Python: >=3.9.0,<4.0.0
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
@@ -17,11 +17,9 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Provides-Extra: black
 Provides-Extra: numpydantic
@@ -34,11 +32,10 @@ Requires-Dist: graphviz (>=0.10.1)
 Requires-Dist: hbreader
 Requires-Dist: isodate (>=0.6.0)
 Requires-Dist: jinja2 (>=3.1.0)
-Requires-Dist: jsonasobj2 (>=1.0.3,<2.0.0)
+Requires-Dist: jsonasobj2 (>=1.0.3,<2.dev0)
 Requires-Dist: jsonschema[format] (>=4.0.0)
-Requires-Dist: linkml-dataops
-Requires-Dist: linkml-runtime (>=1.8.1,<2.0.0)
-Requires-Dist: numpydantic (>=1.6.1) ; (python_version >= "3.9") and (extra == "numpydantic" or extra == "tests")
+Requires-Dist: linkml-runtime (>=1.9.1,<2.0.0)
+Requires-Dist: numpydantic (>=1.6.1) ; extra == "numpydantic" or extra == "tests"
 Requires-Dist: openpyxl
 Requires-Dist: parse
 Requires-Dist: prefixcommons (>=0.1.7)

{linkml-1.9.0rc1 → linkml-1.9.1rc3}/linkml/generators/common/build.py

@@ -5,13 +5,7 @@ Models for intermediate build results
 """
 
 import dataclasses
-from typing import Any, TypeVar
-
-try:
-    from typing import Annotated
-except ImportError:
-    from typing_extensions import Annotated
-
+from typing import Annotated, Any, TypeVar
 
 from linkml_runtime.linkml_model import (
     ClassDefinition,

{linkml-1.9.0rc1 → linkml-1.9.1rc3}/linkml/generators/common/ifabsent_processor.py

@@ -2,7 +2,7 @@ import abc
 import re
 import sys
 from abc import ABC
-from typing import Any, Optional, Type, Union
+from typing import Any, Optional, Union
 
 if sys.version_info < (3, 10):
     from typing_extensions import TypeAlias
@@ -39,25 +39,25 @@ from linkml_runtime.linkml_model.types import (
 )
 
 TYPES_TYPE: TypeAlias = Union[
-    Type[Boolean],
-    Type[Curie],
-    Type[Date],
-    Type[DateOrDatetime],
-    Type[Datetime],
-    Type[Decimal],
-    Type[Double],
-    Type[Float],
-    Type[Integer],
-    Type[Jsonpath],
-    Type[Jsonpointer],
-    Type[Ncname],
-    Type[Nodeidentifier],
-    Type[Objectidentifier],
-    Type[Sparqlpath],
-    Type[String],
-    Type[Time],
-    Type[Uri],
-    Type[Uriorcurie],
+    type[Boolean],
+    type[Curie],
+    type[Date],
+    type[DateOrDatetime],
+    type[Datetime],
+    type[Decimal],
+    type[Double],
+    type[Float],
+    type[Integer],
+    type[Jsonpath],
+    type[Jsonpointer],
+    type[Ncname],
+    type[Nodeidentifier],
+    type[Objectidentifier],
+    type[Sparqlpath],
+    type[String],
+    type[Time],
+    type[Uri],
+    type[Uriorcurie],
 ]
 
 TYPES = [

{linkml-1.9.0rc1 → linkml-1.9.1rc3}/linkml/generators/common/lifecycle.py

@@ -2,7 +2,8 @@
 Lifestyle methods mixin
 """
 
-from typing import Iterable, TypeVar
+from collections.abc import Iterable
+from typing import TypeVar
 
 from linkml_runtime import SchemaView
 from linkml_runtime.linkml_model.meta import (

{linkml-1.9.0rc1 → linkml-1.9.1rc3}/linkml/generators/common/naming.py

@@ -10,7 +10,7 @@ class NamingProfiles(str, Enum):
     graphql = "graphql"
 
 
-class NameCompatibility(object):
+class NameCompatibility:
     """Make a name compatible to the given profile"""
 
     # heading double underscores and digit reserved to names starting with a digit

{linkml-1.9.0rc1 → linkml-1.9.1rc3}/linkml/generators/common/template.py

@@ -5,7 +5,7 @@ See :mod:`.linkml.generators.pydanticgen.template` for example implementation
 """
 
 from copy import copy
-from typing import Any, ClassVar, Dict, List, Optional, Union
+from typing import Any, ClassVar, Optional, Union
 
 from jinja2 import Environment
 from pydantic import BaseModel
@@ -27,7 +27,7 @@ class TemplateModel(BaseModel):
     template: ClassVar[str]
     _environment: ClassVar[Environment]
 
-    meta_exclude: ClassVar[List[str]] = None
+    meta_exclude: ClassVar[list[str]] = None
 
     def render(self, environment: Optional[Environment] = None, **kwargs) -> str:
         """
@@ -62,7 +62,7 @@ class TemplateModel(BaseModel):
         return copy(cls._environment)
 
     @classmethod
-    def exclude_from_meta(cls: "TemplateModel") -> List[str]:
+    def exclude_from_meta(cls: "TemplateModel") -> list[str]:
         """
         Attributes in the source definition to exclude from linkml_meta
         """
@@ -73,9 +73,9 @@ class TemplateModel(BaseModel):
 
 
 def _render(
-    item: Union[TemplateModel, Any, List[Union[Any, TemplateModel]], Dict[str, Union[Any, TemplateModel]]],
+    item: Union[TemplateModel, Any, list[Union[Any, TemplateModel]], dict[str, Union[Any, TemplateModel]]],
     environment: Environment,
-) -> Union[str, List[str], Dict[str, str]]:
+) -> Union[str, list[str], dict[str, str]]:
     if isinstance(item, TemplateModel):
         return item.render(environment)
     elif isinstance(item, list):

{linkml-1.9.0rc1 → linkml-1.9.1rc3}/linkml/generators/common/type_designators.py

@@ -1,5 +1,3 @@
-from typing import List
-
 from linkml_runtime.linkml_model.meta import ClassDefinition, SlotDefinition
 from linkml_runtime.utils.schemaview import SchemaView
 
@@ -22,7 +20,7 @@ def get_type_designator_value(sv: SchemaView, type_designator_slot: SlotDefiniti
 
 def get_accepted_type_designator_values(
     sv: SchemaView, type_designator_slot: SlotDefinition, class_def: ClassDefinition
-) -> List[str]:
+) -> list[str]:
     """
     returns the accepted values for a type designator field for a given class, depending on its range
     this implements the logic described in https://github.com/linkml/linkml/issues/945:

{linkml-1.9.0rc1 → linkml-1.9.1rc3}/linkml/generators/csvgen.py

@@ -6,7 +6,7 @@ import os
 from csv import DictWriter
 from dataclasses import dataclass
 from io import StringIO
-from typing import List, Optional, Set
+from typing import Optional
 
 import click
 from linkml_runtime.linkml_model.meta import ClassDefinition, ClassDefinitionName
@@ -36,7 +36,7 @@ class CsvGenerator(Generator):
     sep: Optional[str] = None
     """Separator for columns"""
 
-    closure: Optional[Set[ClassDefinitionName]] = None
+    closure: Optional[set[ClassDefinitionName]] = None
     """List of classes to include in output"""
 
     writer: Optional[DictWriter] = None
@@ -57,7 +57,7 @@ class CsvGenerator(Generator):
             out = "\n".join([out, f"# version: {self.schema.version}"])
         return out
 
-    def visit_schema(self, classes: List[ClassDefinitionName] = None, **_) -> None:
+    def visit_schema(self, classes: list[ClassDefinitionName] = None, **_) -> None:
         # Note: classes comes from the "root" argument
         self.closure = set()
 

{linkml-1.9.0rc1 → linkml-1.9.1rc3}/linkml/generators/docgen.py

@@ -1,11 +1,12 @@
 import importlib.util
 import logging
 import os
+from collections.abc import Iterable, Iterator
 from copy import deepcopy
 from dataclasses import dataclass, field
 from enum import Enum
 from pathlib import Path
-from typing import Dict, Iterable, Iterator, List, Optional, Tuple, Union
+from typing import Optional, Union
 
 import click
 from jinja2 import Environment, FileSystemLoader, Template
@@ -135,7 +136,7 @@ class DocGenerator(Generator):
     """markdown dialect (e.g MyST, Python)"""
     sort_by: str = "name"
     visit_all_class_slots = False
-    template_mappings: Dict[str, str] = None
+    template_mappings: dict[str, str] = None
     directory: str = None
     """directory in which to write documents"""
 
@@ -462,7 +463,7 @@ class DocGenerator(Generator):
         else:
             return e.name
 
-    def links(self, e_list: List[DefinitionName]) -> List[str]:
+    def links(self, e_list: list[DefinitionName]) -> list[str]:
         """Render list of element documentation pages as hyperlinks.
 
         :param e_list: list of elements
@@ -521,7 +522,7 @@ class DocGenerator(Generator):
         mixins=True,
         descriptions=False,
         focus: DefinitionName = None,
-    ) -> Tuple[str, int]:
+    ) -> tuple[str, int]:
         sv = self.schemaview
         if element.is_a:
             pre, depth = self._tree(
@@ -681,7 +682,7 @@ class DocGenerator(Generator):
         else:
             return "mermaid"
 
-    def mermaid_diagram(self, class_names: List[Union[str, ClassDefinitionName]] = None) -> str:
+    def mermaid_diagram(self, class_names: list[Union[str, ClassDefinitionName]] = None) -> str:
         """
         Render a mermaid diagram for a set of classes
 
@@ -750,8 +751,7 @@ class DocGenerator(Generator):
         """
         elts = self.schemaview.class_induced_slots(class_name)
         _ensure_ranked(elts)
-        for e in elts:
-            yield e
+        yield from elts
 
     def all_class_objects(self) -> Iterator[ClassDefinition]:
         """
@@ -762,8 +762,7 @@ class DocGenerator(Generator):
         """
         elts = self.schemaview.all_classes(imports=self.render_imports).values()
         _ensure_ranked(elts)
-        for e in elts:
-            yield e
+        yield from elts
 
     def all_slot_objects(self) -> Iterator[SlotDefinition]:
         """
@@ -774,8 +773,7 @@ class DocGenerator(Generator):
         """
         elts = self.schemaview.all_slots(imports=self.render_imports).values()
         _ensure_ranked(elts)
-        for e in elts:
-            yield e
+        yield from elts
 
     def all_type_objects(self) -> Iterator[TypeDefinition]:
         """
@@ -786,10 +784,9 @@ class DocGenerator(Generator):
         """
         elts = self.schemaview.all_types(imports=self.render_imports).values()
         _ensure_ranked(elts)
-        for e in elts:
-            yield e
+        yield from elts
 
-    def all_type_object_names(self) -> List[TypeDefinitionName]:
+    def all_type_object_names(self) -> list[TypeDefinitionName]:
         return [t.name for t in list(self.all_type_objects())]
 
     def all_enum_objects(self) -> Iterator[EnumDefinition]:
@@ -801,8 +798,7 @@ class DocGenerator(Generator):
         """
         elts = self.schemaview.all_enums(imports=self.render_imports).values()
         _ensure_ranked(elts)
-        for e in elts:
-            yield e
+        yield from elts
 
     def all_subset_objects(self) -> Iterator[SubsetDefinition]:
         """
@@ -813,10 +809,9 @@ class DocGenerator(Generator):
         """
         elts = self.schemaview.all_subsets(imports=self.render_imports).values()
         _ensure_ranked(elts)
-        for e in elts:
-            yield e
+        yield from elts
 
-    def class_hierarchy_as_tuples(self) -> Iterator[Tuple[int, ClassDefinitionName]]:
+    def class_hierarchy_as_tuples(self) -> Iterator[tuple[int, ClassDefinitionName]]:
         """
         Generate a hierarchical representation of all classes in the schema
 
@@ -880,7 +875,7 @@ class DocGenerator(Generator):
         return slot
 
     @staticmethod
-    def get_direct_slot_names(cls: ClassDefinition) -> List[SlotDefinitionName]:
+    def get_direct_slot_names(cls: ClassDefinition) -> list[SlotDefinitionName]:
         """Fetch list of all own attributes of a class, i.e.,
         all slot names of slots that belong to the domain of a class.
 
@@ -889,7 +884,7 @@ class DocGenerator(Generator):
         """
         return cls.slots + list(cls.attributes.keys())
 
-    def get_direct_slots(self, cls: ClassDefinition) -> List[SlotDefinition]:
+    def get_direct_slots(self, cls: ClassDefinition) -> list[SlotDefinition]:
         """Fetch list of all own attributes of a class, i.e.,
         all slots that belong to the domain of a class.
 
@@ -900,7 +895,7 @@ class DocGenerator(Generator):
             self.inject_slot_info(self.schemaview.induced_slot(sn, cls.name)) for sn in self.get_direct_slot_names(cls)
         ]
 
-    def get_indirect_slots(self, cls: ClassDefinition) -> List[SlotDefinition]:
+    def get_indirect_slots(self, cls: ClassDefinition) -> list[SlotDefinition]:
         """Fetch list of all inherited attributes of a class, i.e.,
         all slots that belong to the domain of a class.
 
@@ -917,7 +912,7 @@ class DocGenerator(Generator):
 
     def get_slot_inherited_from(
         self, class_name: ClassDefinitionName, slot_name: SlotDefinitionName
-    ) -> List[ClassDefinitionName]:
+    ) -> list[ClassDefinitionName]:
         """Get the name of the class that a given slot is inherited from.
 
         :param class_name: name of the class whose slot we are checking
@@ -929,7 +924,7 @@ class DocGenerator(Generator):
         ancestors = sv.class_ancestors(class_name)
         return list(set(induced_slot.domain_of).intersection(ancestors))
 
-    def get_mixin_inherited_slots(self, cls: ClassDefinition) -> Dict[str, List[str]]:
+    def get_mixin_inherited_slots(self, cls: ClassDefinition) -> dict[str, list[str]]:
         """Fetch list of all slots acquired through mixing.
 
         :param cls: class for which we want to determine the mixed in slots
@@ -944,7 +939,7 @@ class DocGenerator(Generator):
 
         return mixed_in_slots
 
-    def example_object_blobs(self, class_name: str) -> List[Tuple[str, str]]:
+    def example_object_blobs(self, class_name: str) -> list[tuple[str, str]]:
         """Fetch list of all examples of a class.
 
         :param class_name: class for which we want to determine the examples

{linkml-1.9.0rc1 → linkml-1.9.1rc3}/linkml/generators/dotgen.py

@@ -4,7 +4,7 @@ Generate dotfiles
 
 import os
 from dataclasses import dataclass
-from typing import List, Optional
+from typing import Optional
 
 import click
 from deprecated.classic import deprecated
@@ -35,19 +35,19 @@ class DotGenerator(Generator):
     uses_schemaloader = True
 
     # ObjectVars
-    classnames: Optional[List[str]] = None
+    classnames: Optional[list[str]] = None
     filename: Optional[str] = None
     dirname: Optional[str] = None
     filedot: Optional[Digraph] = None
     classdot: Optional[Digraph] = None
     cls_subj: Optional[SlotDefinition] = None
     cls_obj: Optional[SlotDefinition] = None
-    classname: Optional[List[str]] = None
+    classname: Optional[list[str]] = None
     directory: Optional[str] = None
 
     def visit_schema(
         self,
-        classname: Optional[List[str]] = None,
+        classname: Optional[list[str]] = None,
         directory: Optional[str] = None,
         filename: Optional[str] = None,
         **_,

{linkml-1.9.0rc1 → linkml-1.9.1rc3}/linkml/generators/erdiagramgen.py

@@ -1,7 +1,7 @@
 import os
 from dataclasses import dataclass
 from enum import Enum
-from typing import List, Optional, Set, Union
+from typing import Optional, Union
 
 import click
 import pydantic
@@ -75,7 +75,7 @@ class Entity(pydantic.BaseModel):
     """Entity in an ER diagram."""
 
     name: str
-    attributes: List[Attribute] = []
+    attributes: list[Attribute] = []
 
     def __str__(self):
         attrs = "\n".join([str(a) for a in self.attributes])
@@ -97,8 +97,8 @@ class Relationship(pydantic.BaseModel):
 class ERDiagram(pydantic.BaseModel):
     """Represents an Diagram of Entities and Relationships"""
 
-    entities: List[Entity] = []
-    relationships: List[Relationship] = []
+    entities: list[Entity] = []
+    relationships: list[Relationship] = []
 
     def __str__(self):
         ents = "\n".join([str(e) for e in self.entities])
@@ -160,7 +160,7 @@ class ERDiagramGenerator(Generator):
 
     def serialize_classes(
         self,
-        class_names: List[Union[str, ClassDefinitionName]],
+        class_names: list[Union[str, ClassDefinitionName]],
         follow_references=False,
         max_hops: int = None,
         include_upstream: bool = False,
@@ -220,7 +220,7 @@ class ERDiagramGenerator(Generator):
         else:
             return er
 
-    def add_upstream_class(self, class_name: ClassDefinitionName, targets: Set[str], diagram: ERDiagram) -> None:
+    def add_upstream_class(self, class_name: ClassDefinitionName, targets: set[str], diagram: ERDiagram) -> None:
         sv = self.schemaview
         cls = sv.get_class(class_name)
         entity = Entity(name=camelcase(cls.name))
@@ -316,7 +316,7 @@ class ERDiagramGenerator(Generator):
 @click.command(name="erdiagram")
 def cli(
     yamlfile,
-    classes: List[str],
+    classes: list[str],
     max_hops: Optional[int],
     follow_references: bool,
     include_upstream: bool = False,

{linkml-1.9.0rc1 → linkml-1.9.1rc3}/linkml/generators/excelgen.py

@@ -1,7 +1,6 @@
 import logging
 from dataclasses import dataclass
 from pathlib import Path
-from typing import List
 
 import click
 from linkml_runtime.utils.schemaview import SchemaView
@@ -42,7 +41,7 @@ class ExcelGenerator(Generator):
         workbook.save(workbook_path)
         return workbook
 
-    def create_workbook_and_worksheets(self, output_path: Path, classes: List[str]) -> None:
+    def create_workbook_and_worksheets(self, output_path: Path, classes: list[str]) -> None:
         """
         Creates a workbook with worksheets for each class.
 
@@ -89,7 +88,7 @@ class ExcelGenerator(Generator):
             self.logger.info(f"The Excel workbooks have been written to {output_path}")
 
     @staticmethod
-    def add_columns_to_worksheet(workbook: Workbook, worksheet_name: str, sheet_headings: List[str]) -> None:
+    def add_columns_to_worksheet(workbook: Workbook, worksheet_name: str, sheet_headings: list[str]) -> None:
         """
         Get a worksheet by name and add a column to it in an existing workbook.
 

{linkml-1.9.0rc1 → linkml-1.9.1rc3}/linkml/generators/golanggen.py

@@ -1,7 +1,7 @@
 import logging
 import os
 from dataclasses import dataclass
-from typing import List, Optional
+from typing import Optional
 
 import click
 from jinja2 import Template
@@ -181,7 +181,7 @@ class GolangGenerator(Generator):
             return "string"
 
     @staticmethod
-    def parents(cls: ClassDefinition) -> List[ClassDefinitionName]:
+    def parents(cls: ClassDefinition) -> list[ClassDefinitionName]:
         if cls.is_a:
             parents = [cls.is_a]
         else:

{linkml-1.9.0rc1 → linkml-1.9.1rc3}/linkml/generators/golrgen.py

@@ -9,7 +9,7 @@ See the golr-views directory in this repo for examples
 
 import os
 from dataclasses import dataclass
-from typing import List, Optional
+from typing import Optional
 
 import click
 from linkml_runtime.linkml_model.meta import ClassDefinition, SlotDefinition
@@ -26,7 +26,7 @@ class GOLRField(YAMLRoot):
     id: str
     description: str
     display_name: str
-    property: List = empty_list()
+    property: list = empty_list()
     cardinality: Optional[str] = None
 
 
@@ -38,7 +38,7 @@ class GOLRClass(YAMLRoot):
     display_name: str
     document_category: str
     weight: int
-    fields: List[GOLRField] = empty_list()
+    fields: list[GOLRField] = empty_list()
 
 
 @dataclass

{linkml-1.9.0rc1 → linkml-1.9.1rc3}/linkml/generators/jsonldcontextgen.py

@@ -6,7 +6,7 @@ Generate JSON-LD contexts
 import os
 import re
 from dataclasses import dataclass, field
-from typing import Any, Dict, Optional, Set, Union
+from typing import Any, Optional, Union
 
 import click
 from jsonasobj2 import JsonObj, as_json
@@ -39,10 +39,10 @@ class ContextGenerator(Generator):
     file_extension = "context.jsonld"
 
     # ObjectVars
-    emit_prefixes: Set[str] = field(default_factory=lambda: set())
+    emit_prefixes: set[str] = field(default_factory=lambda: set())
     default_ns: str = None
-    context_body: Dict = field(default_factory=lambda: dict())
-    slot_class_maps: Dict = field(default_factory=lambda: dict())
+    context_body: dict = field(default_factory=lambda: dict())
+    slot_class_maps: dict = field(default_factory=lambda: dict())
     emit_metadata: bool = False
     model: Optional[bool] = True
     base: Optional[Union[str, Namespace]] = None

{linkml-1.9.0rc1 → linkml-1.9.1rc3}/linkml/generators/jsonschemagen.py

@@ -3,7 +3,7 @@ import logging
 import os
 from copy import deepcopy
 from dataclasses import dataclass
-from typing import Any, Dict, List, Optional, Tuple, Union
+from typing import Any, Optional, Union
 
 import click
 from linkml_runtime.linkml_model.meta import (
@@ -33,7 +33,7 @@ logger = logging.getLogger(__name__)
 # Note: The underlying types are a union of any built-in python datatype + any type defined in
 #       linkml-runtime/utils/metamodelcore.py
 # Note the keys are all lower case
-json_schema_types: Dict[str, Tuple[str, Optional[str]]] = {
+json_schema_types: dict[str, tuple[str, Optional[str]]] = {
     "int": ("integer", None),
     "integer": ("integer", None),
     "bool": ("boolean", None),
@@ -69,7 +69,7 @@ class JsonSchema(dict):
             identifier_name = self._lax_forward_refs.pop(canonical_name)
             self.add_lax_def(canonical_name, identifier_name)
 
-    def add_lax_def(self, names: Union[str, List[str]], identifier_name: str) -> None:
+    def add_lax_def(self, names: Union[str, list[str]], identifier_name: str) -> None:
         # JSON-Schema does not have inheritance,
         # so we duplicate slots from inherited parents and mixins
         # Maps e.g. Person --> Person__identifier_optional
@@ -147,7 +147,7 @@ class JsonSchema(dict):
         return json.dumps(self, **kwargs)
 
     @classmethod
-    def ref_for(cls, class_name: Union[str, List[str]], identifier_optional: bool = False, required: bool = True):
+    def ref_for(cls, class_name: Union[str, list[str]], identifier_optional: bool = False, required: bool = True):
         def _ref(class_name):
             def_name = camelcase(class_name)
             def_suffix = cls.OPTIONAL_IDENTIFIER_SUFFIX if identifier_optional else ""
@@ -459,7 +459,7 @@ class JsonSchemaGenerator(Generator, LifecycleMixin):
 
     def get_type_info_for_slot_subschema(
         self, slot: Union[SlotDefinition, AnonymousSlotExpression]
-    ) -> Tuple[str, str, Union[str, List[str]]]:
+    ) -> tuple[str, str, Union[str, list[str]]]:
         # JSON Schema type (https://json-schema.org/understanding-json-schema/reference/type.html)
         typ = None
         # Reference to a JSON schema entity (https://json-schema.org/understanding-json-schema/structuring.html#ref)

{linkml-1.9.0rc1 → linkml-1.9.1rc3}/linkml/generators/markdowngen.py

@@ -1,7 +1,7 @@
 import os
 import re
 from dataclasses import dataclass
-from typing import Any, Callable, Dict, List, Optional, Set, Union
+from typing import Any, Callable, Optional, Union
 
 import click
 from jsonasobj2 import JsonObj, values
@@ -44,20 +44,20 @@ class MarkdownGenerator(Generator):
     # ObjectVars
     directory: Optional[str] = None
     image_directory: Optional[str] = None
-    classes: Set[ClassDefinitionName] = None
+    classes: set[ClassDefinitionName] = None
     image_dir: bool = False
     index_file: str = "index.md"
     noimages: bool = False
     noyuml: bool = False
     no_types_dir: bool = False
     warn_on_exist: bool = False
-    gen_classes: Optional[Set[ClassDefinitionName]] = None
+    gen_classes: Optional[set[ClassDefinitionName]] = None
     gen_classes_neighborhood: Optional[References] = None
 
     def visit_schema(
         self,
         directory: str = None,
-        classes: Set[ClassDefinitionName] = None,
+        classes: set[ClassDefinitionName] = None,
         image_dir: bool = False,
         index_file: str = "index.md",
         noimages: bool = False,
@@ -267,10 +267,8 @@ class MarkdownGenerator(Generator):
 
             items.append(self.header(2, "Domain and Range"))
             items.append(
-                (
-                    f"{self.class_link(slot.domain)} →{self.predicate_cardinality(slot)} "
-                    f"{self.class_type_link(slot.range)}"
-                )
+                f"{self.class_link(slot.domain)} →{self.predicate_cardinality(slot)} "
+                f"{self.class_type_link(slot.range)}"
             )
 
             items.append(self.header(2, "Parents"))
@@ -374,7 +372,7 @@ class MarkdownGenerator(Generator):
 
         def prop_list(
             title: str,
-            entries: Union[List, Dict],
+            entries: Union[list, dict],
             formatter: Optional[Callable[[Element], str]] = None,
         ) -> Optional[str]:
             if formatter is None:
@@ -457,7 +455,7 @@ class MarkdownGenerator(Generator):
         #       - related mappings
         #       - deprecated element has exact replacement
         #       - deprecated element has possible replacement
-        if type(obj) == EnumDefinition:
+        if type(obj) is EnumDefinition:
             items.insert(0, enum_list("Permissible Values", obj))
             items.insert(1, "\n")