Skip to content

Commit

Permalink
fix some issues
Browse files Browse the repository at this point in the history
  • Loading branch information
luwqz1 committed Jul 9, 2024
1 parent 2eb34cf commit 7638333
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 41 deletions.
2 changes: 1 addition & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,6 @@ Join our [telegram forum](https://t.me/botoforum).

# License

Telegrinder is [MIT licensed](./LICENSE)
Telegrinder is [MIT licensed](./LICENSE)\
Copyright © 2022-2024 [timoniq](https://github.com/timoniq)\
Copyright © 2024 [luwqz1](https://github.com/luwqz1)
16 changes: 2 additions & 14 deletions telegrinder/msgspec_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,6 @@ def decode(self, buf: str | bytes) -> typing.Any: ...
@typing.overload
def decode(self, buf: str | bytes, *, type: type[T]) -> T: ...

@typing.overload
def decode(self, buf: str | bytes, *, type: typing.Any = typing.Any) -> typing.Any: ...

@typing.overload
def decode(
self,
Expand All @@ -185,19 +182,10 @@ def decode(
strict: bool = True,
) -> T: ...

@typing.overload
def decode(
self,
buf: str | bytes,
*,
type: typing.Any = typing.Any,
strict: bool = True,
) -> typing.Any: ...

def decode(self, buf, *, type=typing.Any, strict=True):
def decode(self, buf, *, type=object, strict=True):
return msgspec.json.decode(
buf,
type=type,
type=typing.Any if type is object else type,
strict=strict,
dec_hook=self.dec_hook,
)
Expand Down
30 changes: 5 additions & 25 deletions telegrinder/tools/global_context/global_context.py
Original file line number Diff line number Diff line change
Expand Up @@ -313,14 +313,7 @@ def pop(
var_value_type: type[T],
) -> Option[GlobalCtxVar[T]]: ...

@typing.overload
def pop(
self,
var_name: str,
var_value_type: typing.Any = typing.Any,
) -> Option[GlobalCtxVar[typing.Any]]: ...

def pop(self, var_name, var_value_type=typing.Any):
def pop(self, var_name: str, var_value_type=object): # type: ignore
"""Pop context variable by name."""

val = self.get(var_name, var_value_type) # type: ignore
Expand All @@ -339,16 +332,10 @@ def get(
var_value_type: type[T],
) -> Option[GlobalCtxVar[T]]: ...

@typing.overload
def get(
self,
var_name: str,
var_value_type: typing.Any = typing.Any,
) -> Option[GlobalCtxVar[typing.Any]]: ...

def get(self, var_name, var_value_type=typing.Any):
def get(self, var_name, var_value_type=object): # type: ignore
"""Get context variable by name."""

var_value_type = typing.Any if var_value_type is object else type
generic_types = typing.get_args(get_orig_class(self))
if generic_types and var_value_type is object:
var_value_type = generic_types[0]
Expand Down Expand Up @@ -377,17 +364,10 @@ def get_value(
var_value_type: type[T],
) -> Option[T]: ...

@typing.overload
def get_value(
self,
var_name: str,
var_value_type: typing.Any = typing.Any,
) -> Option[typing.Any]: ...

def get_value(self, var_name, var_value_type=typing.Any):
def get_value(self, var_name, var_value_type=object): # type: ignore
"""Get context variable value by name."""

return self.get(var_name, var_value_type).map(lambda var: var.value) # type: ignore
return self.get(var_name, var_value_type).map(lambda var: var.value)

def rename(self, old_var_name: str, new_var_name: str) -> Result[_, str]:
"""Rename context variable."""
Expand Down
2 changes: 1 addition & 1 deletion typegen/generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ def generate(self, path: str) -> None:
default_params_typeddict = 'typing.TypedDict("DefaultParams", {})'.format(
"{%s}"
% ", ".join(
f'"{x['name']}": {convert_to_python_type(x['type'], parent_types=self.parent_types)}'
f""""{x['name']}": {convert_to_python_type(x['type'], parent_types=self.parent_types)}"""
for x in self.config_default_api_params
)
)
Expand Down

0 comments on commit 7638333

Please sign in to comment.