p2p-ld/nwb-linkml
1
0
Fork 0
mirror of https://github.com/p2p-ld/nwb-linkml.git synced 2024-11-10 00:34:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

allow lists and singletons in generator

Browse source
This commit is contained in:
sneakers-the-rat 2023-10-10 00:50:51 -07:00
parent 2d1fe3ad96
commit 825b5914db
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nwb_linkml/src/nwb_linkml/generators/pydantic.py
View file

@ -74,11 +74,11 @@ def default_template(pydantic_ver: str = "2", extra_classes:Optional[List[Type[B
from __future__ import annotations from __future__ import annotations
from datetime import datetime, date from datetime import datetime, date
from enum import Enum from enum import Enum
from typing import List, Dict, Optional, Any, Union, ClassVar from typing import Dict, Optional, Any, Union, ClassVar, Annotated, TypeVar, List
from pydantic import BaseModel as BaseModel, Field""" from pydantic import BaseModel as BaseModel, Field"""
if pydantic_ver == '2': if pydantic_ver == '2':
template += """ template += """
from pydantic import ConfigDict from pydantic import ConfigDict, BeforeValidator
""" """
template +=""" template +="""
from nptyping import Shape, Float, Float32, Double, Float64, LongLong, Int64, Int, Int32, Int16, Short, Int8, UInt, UInt32, UInt16, UInt8, UInt64, Number, String, Unicode, Unicode, Unicode, String, Bool, Datetime64 from nptyping import Shape, Float, Float32, Double, Float64, LongLong, Int64, Int, Int32, Int16, Short, Int8, UInt, UInt32, UInt16, UInt8, UInt64, Number, String, Unicode, Unicode, Unicode, String, Bool, Datetime64
@ -101,6 +101,8 @@ version = "{{version if version else None}}"
### BASE MODEL ### ### BASE MODEL ###
if pydantic_ver == "1": # pragma: no cover if pydantic_ver == "1": # pragma: no cover
template += """ template += """
List = BaseList
class WeakRefShimBaseModel(BaseModel): class WeakRefShimBaseModel(BaseModel):
__slots__ = '__weakref__' __slots__ = '__weakref__'
@ -741,7 +743,7 @@ class NWBPydanticGenerator(PydanticGenerator):
else: # pragma: no cover else: # pragma: no cover
collection_key = None collection_key = None
if s.inlined is False or collection_key is None or s.inlined_as_list is True: # pragma: no cover if s.inlined is False or collection_key is None or s.inlined_as_list is True: # pragma: no cover
pyrange = f"List[{pyrange}]" pyrange = f"List[{pyrange}] | {pyrange}"
else: else:
pyrange = f"Dict[{collection_key}, {pyrange}]" pyrange = f"Dict[{collection_key}, {pyrange}]"
if not s.required and not s.designates_type: if not s.required and not s.designates_type: