Skip to content

Commit d1b0557

Browse files
authored
vanilla src layout (#147)
1 parent 5290157 commit d1b0557

File tree

5 files changed

+12
-27
lines changed

5 files changed

+12
-27
lines changed

hololinked/core/actions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ def inner(obj):
347347
except Exception as ex:
348348
if global_config.VALIDATE_SCHEMAS:
349349
warnings.warn(
350-
f"Could not infer input schema for {obj.__name__} due to {str(ex)}. "
350+
f"Could not infer input schema for {obj.__name__} due to - {str(ex)}. "
351351
+ "Considering filing a bug report if you think this should have worked correctly",
352352
category=RuntimeWarning,
353353
)

hololinked/core/properties.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121
named_objs,
2222
)
2323
from .property import Property
24-
from ..constants import USE_OBJECT_NAME, HTTP_METHODS
25-
26-
GET = HTTP_METHODS.GET
27-
PUT = HTTP_METHODS.PUT
2824

2925

3026
class String(Property):

hololinked/core/property.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,10 @@ def to_affordance(self, owner_inst=None):
328328
return PropertyAffordance.generate(self, owner_inst or self.owner)
329329

330330

331+
class ModelRoot(RootModel):
332+
model_config = ConfigDict(arbitrary_types_allowed=True)
333+
334+
331335
def wrap_plain_types_in_rootmodel(model: type) -> Type[BaseModel] | Type[RootModel]:
332336
"""
333337
Ensure a type is a subclass of BaseModel.
@@ -341,12 +345,7 @@ def wrap_plain_types_in_rootmodel(model: type) -> Type[BaseModel] | Type[RootMod
341345
return
342346
if issubklass(model, BaseModel):
343347
return model
344-
return create_model(
345-
f"{model!r}",
346-
root=(model, ...),
347-
__base__=RootModel,
348-
__config__=ConfigDict(arbitrary_types_allowed=True),
349-
) # type: ignore[call-overload]
348+
return create_model(f"{model!r}", root=(model, ...), __base__=ModelRoot) # type: ignore[call-overload]
350349

351350

352351
__all__ = [Property.__name__]

hololinked/param/exceptions.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import typing
1+
from typing import NoReturn
22
from contextlib import contextmanager
33

44

5-
def raise_TypeError(message, parameter) -> typing.NoReturn:
5+
def raise_TypeError(message, parameter) -> NoReturn:
66
owner_str = ""
77
if isinstance(parameter, Parameter):
88
owner_str = f" Owner info : {parameter.owner}, parameter name : {parameter.name}."
@@ -11,7 +11,7 @@ def raise_TypeError(message, parameter) -> typing.NoReturn:
1111
raise TypeError(message + owner_str)
1212

1313

14-
def raise_ValueError(message, parameter) -> typing.NoReturn:
14+
def raise_ValueError(message, parameter) -> NoReturn:
1515
owner_str = ""
1616
if isinstance(parameter, Parameter):
1717
owner_str = f" Owner info : {parameter.owner}, parameter name : {parameter.name}."

pyproject.toml

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
requires = ["setuptools>=42", "wheel"]
33
build-backend = "setuptools.build_meta"
44

5+
[tool.setuptools]
6+
package-dir = {"hololinked" = "hololinked"}
7+
58
[project]
69
name = "hololinked"
710
version = "0.3.8"
@@ -58,19 +61,6 @@ dependencies = [
5861
Documentation = "https://docs.hololinked.dev"
5962
Repository = "https://github.com/hololinked-dev/hololinked"
6063

61-
[tool.setuptools]
62-
packages = [
63-
"hololinked",
64-
"hololinked.server", "hololinked.server.http",
65-
"hololinked.client", "hololinked.client.http", "hololinked.client.zmq",
66-
"hololinked.param",
67-
"hololinked.schema_validators",
68-
"hololinked.serializers",
69-
"hololinked.storage",
70-
"hololinked.td",
71-
"hololinked.core", "hololinked.core.zmq"
72-
]
73-
7464
[dependency-groups]
7565
dev = [
7666
"ipython==8.12.3",

0 commit comments

Comments
 (0)