Skip to content

fix: request param, from opt to opts #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
feiyefengbai wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: request param, from opt to opts #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/gospeed_api/index.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,28 +102,28 @@ async def async_get_task_list(self,id_list: List[str], status: List[TASK_STATUS]

def create_a_task_from_resolved_id(self, rid: str, opt: CreateTask_DownloadOpt | None = None) -> CreateATask_Response:
"""receive CreateATask_fromResolvedId object as paramter. see src\gospeed_api\models\create_a_task.py for detail return data structure."""
param = CreateATask_fromResolvedId(rid=rid, opt=opt)
param = CreateATask_fromResolvedId(rid=rid, opts=opt)
res = self.httpx_client.post(url=self.endpoint_task, json=param.model_dump(exclude_none=True, exclude_defaults=True, exclude_unset=True))
json = check_response_and_return_data(res)
return CreateATask_Response(**json)

async def async_create_a_task_from_resolved_id(self, rid: str, opt: CreateTask_DownloadOpt | None = None) -> CreateATask_Response:
"""receive CreateATask_fromResolvedId object as paramter. see src\gospeed_api\models\create_a_task.py for detail return data structure."""
param = CreateATask_fromResolvedId(rid=rid, opt=opt)
param = CreateATask_fromResolvedId(rid=rid, opts=opt)
res = await self.async_httpx_client.post(url=self.endpoint_task, json=param.model_dump(exclude_none=True, exclude_defaults=True, exclude_unset=True))
json = check_response_and_return_data(res)
return CreateATask_Response(**json)

def create_a_task_from_url(self, url: str, extra: Request_Extra_Opt | None = None, labels: Dict[str, str] | None = None, opt: CreateTask_DownloadOpt | None = None) -> CreateATask_Response:
"""Directly create a task instead of resolve it's information first."""
param = CreateATask_FromUrl(req=ResolveRequest(url=url, extra=extra, labels=labels), opt=opt)
param = CreateATask_FromUrl(req=ResolveRequest(url=url, extra=extra, labels=labels), opts=opt)
res = self.httpx_client.post(self.endpoint_task, json=param.model_dump(exclude_none=True, exclude_defaults=True, exclude_unset=True))
json = check_response_and_return_data(res)
return CreateATask_Response(**json)

async def async_create_a_task_from_url(self, url: str, extra: Request_Extra_Opt | None = None, labels: Dict[str, str] | None = None, opt: CreateTask_DownloadOpt | None = None) -> CreateATask_Response:
"""Directly create a task instead of resolve it's information first."""
param = CreateATask_FromUrl(req=ResolveRequest(url=url, extra=extra, labels=labels), opt=opt)
param = CreateATask_FromUrl(req=ResolveRequest(url=url, extra=extra, labels=labels), opts=opt)
res = await self.async_httpx_client.post(self.endpoint_task, json=param.model_dump(exclude_none=True, exclude_defaults=True, exclude_unset=True))
json = check_response_and_return_data(res)
return CreateATask_Response(**json)
Expand All @@ -145,15 +145,15 @@ async def async_delete_tasks(self, id_list: List[str] | None = None, status: Lis
def create_a_batch_of_tasks(self, urls: List[str], opt: CreateTask_DownloadOpt | None = None) -> CreateABatchOfTasks_Response:
"""Create multiple tasks at once."""
reqs = [TaskUrl(url=url) for url in urls]
data = CreateABatchOfTasks(reqs=reqs, opt=opt)
data = CreateABatchOfTasks(reqs=reqs, opts=opt)
res = self.httpx_client.post(self.endpoint_task_batch, json=data.model_dump(exclude_none=True, exclude_defaults=True, exclude_unset=True))
json = check_response_and_return_data(res)
return CreateABatchOfTasks_Response(**json)

async def async_create_a_batch_of_tasks(self, urls: List[str], opt: CreateTask_DownloadOpt | None = None) -> CreateABatchOfTasks_Response:
"""Create multiple tasks at once."""
reqs = [TaskUrl(url=url) for url in urls]
data = CreateABatchOfTasks(reqs=reqs, opt=opt)
data = CreateABatchOfTasks(reqs=reqs, opts=opt)
res = await self.async_httpx_client.post(self.endpoint_task_batch, json=data.model_dump(exclude_none=True, exclude_defaults=True, exclude_unset=True))
json = check_response_and_return_data(res)
return CreateABatchOfTasks_Response(**json)
Expand Down
2 changes: 1 addition & 1 deletion src/gospeed_api/models/create_a_batch_of_tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class TaskUrl(BaseModel):

class CreateABatchOfTasks(BaseModel):
reqs: List[TaskUrl]
opt: CreateTask_DownloadOpt | None = None
opts: CreateTask_DownloadOpt | None = None

class CreateABatchOfTasks_Response(BaseModel):
code: int
Expand Down
4 changes: 2 additions & 2 deletions src/gospeed_api/models/create_a_task.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

class CreateATask_fromResolvedId(BaseModel):
rid: str
opt: CreateTask_DownloadOpt | None = None
opts: CreateTask_DownloadOpt | None = None

class CreateATask_FromUrl(BaseModel):
req: ResolveRequest
opt: CreateTask_DownloadOpt | None = None
opts: CreateTask_DownloadOpt | None = None

class CreateATask_Response(GopeedResponse):
code: int
Expand Down