implement #29

[lubaskinc0de]

its now working like

from dataclasses import dataclass
from typing import Optional

from requests import Session

from dataclass_rest import get
from dataclass_rest.http.requests import RequestsClient


@dataclass
class Todo:
    id: int
    todo: str
    completed: bool
    userId: int


def url_generator(todo_id: Optional[int] = None) -> str:
    if todo_id:
        return f"/todos/{todo_id}"
    return f"/todos/random/"


class RealClient(RequestsClient):
    def __init__(self):
        super().__init__("https://dummyjson.com/", Session())

    @get(url_generator)
    def random_todo(self, todo_id: Optional[int] = None) -> Todo:
        pass


client = RealClient()
print(client.random_todo(5))  # Todo(id=5, todo="Solve a Rubik's cube", completed=False, userId=31)
print(client.random_todo())  # Todo(id=50, todo='Start a band', completed=False, userId=13)

[Tishka17]

probably you meant

url_template.format if isinstance(url_template, str) else url_template

[lubaskinc0de]

yes, its better

[Tishka17]

you actually pass only functions here.

[lubaskinc0de]

yes

[Tishka17]

let's store original string as well. It call be helpful for debugging

[lubaskinc0de]

how can i store it? pass it as different argument?

[Tishka17]

why?

[lubaskinc0de]

because we can use function for getting url only when we has access to arguments and its values that passed to handler

like in boundmethod

    def _get_query_params(self, args) -> Any:
        url_params = get_url_params(self.method_spec.url_template, args)
        skipped_params = url_params + self.method_spec.file_param_names + [self.method_spec.body_param_name]
        query_params_type = create_query_params_type(getfullargspec(self.method_spec.func), self.method_spec.func, skipped_params)

        return self.client.request_args_factory.dump(
            args, query_params_type,
        )

[Tishka17]

whats that is supposed to do?

[Tishka17]

Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
TypeError: 'type' object is not subscriptable

[lubaskinc0de]

now this code works, i tested it on 3.9.8 and 3.12.1 both

from dataclasses import dataclass
from typing import Optional

from requests import Session

from dataclass_rest import get
from dataclass_rest.http.requests import RequestsClient


@dataclass
class Todo:
    id: int
    todo: str
    completed: bool
    userId: int


def url_generator(todo_id: Optional[int] = None) -> str:
    if todo_id:
        return f"/todos/{todo_id}"
    return f"/todos/random/"


def second_url_generator(xxx: str):
    if not xxx:
        return "/todos/random/"

    return f"/todos/random?xxx={xxx}"


class RealClient(RequestsClient):
    def __init__(self):
        super().__init__("https://dummyjson.com/", Session())

    @get(url_generator)
    def todo(self, some_arg: int, *, todo_id: Optional[int] = None, color: str = "green") -> Todo:
        pass

    @get("/todos/random")
    def random(self, hello: str) -> Todo:
        pass

    @get(second_url_generator)
    def random_hello(self, xxx: str) -> Todo:
        pass


client = RealClient()

print(client.todo(5, todo_id=5, color="red"))  # Todo(id=5, todo="Solve a Rubik's cube", completed=False, userId=31)
print(client.todo(5, color="red"))  # Todo(id=50, todo='Start a band', completed=False, userId=13)
print(client.random(hello="world"))  # Todo(id=31, todo='Find a charity and donate to it', completed=True, userId=35)
print(client.random_hello("xxxx"))  # Todo(id=103, todo='Go to a local thrift shop', completed=True, userId=5)

[lubaskinc0de]

looks like I left some unused attributes in MethodSpec after refactoring, I'll fix that tonight when I'm home.

[Tishka17]

I'd rather split into 2 functions. It's strange to get arg_spec for string.
Additionally we can remove try/except below and just call 2 different functions for both cases

[lubaskinc0de]

done

[Tishka17]

Please, add tests