Skip to content

Commit c6294da

Browse files
committed
fix dtos
1 parent 7646ce6 commit c6294da

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

servicestack/dtos.py

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from dataclasses import dataclass
33
from dataclasses_json import dataclass_json, LetterCase, Undefined
44
from datetime import datetime, timedelta
5+
from enum import Enum, IntEnum
56

67
T = TypeVar('T')
78
Table = TypeVar('Table')
@@ -469,7 +470,7 @@ class WorkerStats:
469470
retries: int = 0
470471
failed: int = 0
471472
running_job: Optional[int] = None
472-
running_time: Optional[datetime.timedelta] = None
473+
running_time: Optional[timedelta] = None
473474

474475
@dataclass_json(letter_case=LetterCase.CAMEL, undefined=Undefined.EXCLUDE)
475476
@dataclass
@@ -482,8 +483,8 @@ class BackgroundJobBase:
482483
batch_id: Optional[str] = None
483484
callback: Optional[str] = None
484485
depends_on: Optional[int] = None
485-
run_after: Optional[datetime.datetime] = None
486-
created_date: datetime.datetime = datetime.datetime(1, 1, 1)
486+
run_after: Optional[datetime] = None
487+
created_date: datetime = datetime(1, 1, 1)
487488
created_by: Optional[str] = None
488489
request_id: Optional[str] = None
489490
request_type: Optional[str] = None
@@ -494,17 +495,17 @@ class BackgroundJobBase:
494495
response: Optional[str] = None
495496
response_body: Optional[str] = None
496497
state: Optional[BackgroundJobState] = None
497-
started_date: Optional[datetime.datetime] = None
498-
completed_date: Optional[datetime.datetime] = None
499-
notified_date: Optional[datetime.datetime] = None
498+
started_date: Optional[datetime] = None
499+
completed_date: Optional[datetime] = None
500+
notified_date: Optional[datetime] = None
500501
retry_limit: Optional[int] = None
501502
attempts: int = 0
502503
duration_ms: int = 0
503504
timeout_secs: Optional[int] = None
504505
progress: Optional[float] = None
505506
status: Optional[str] = None
506507
logs: Optional[str] = None
507-
last_activity_date: Optional[datetime.datetime] = None
508+
last_activity_date: Optional[datetime] = None
508509
reply_to: Optional[str] = None
509510
error_code: Optional[str] = None
510511
error: Optional[ResponseStatus] = None
@@ -525,16 +526,16 @@ class JobSummary:
525526
worker: Optional[str] = None
526527
tag: Optional[str] = None
527528
batch_id: Optional[str] = None
528-
created_date: datetime.datetime = datetime.datetime(1, 1, 1)
529+
created_date: datetime = datetime(1, 1, 1)
529530
created_by: Optional[str] = None
530531
request_type: Optional[str] = None
531532
command: Optional[str] = None
532533
request: Optional[str] = None
533534
response: Optional[str] = None
534535
user_id: Optional[str] = None
535536
callback: Optional[str] = None
536-
started_date: Optional[datetime.datetime] = None
537-
completed_date: Optional[datetime.datetime] = None
537+
started_date: Optional[datetime] = None
538+
completed_date: Optional[datetime] = None
538539
state: Optional[BackgroundJobState] = None
539540
duration_ms: int = 0
540541
attempts: int = 0
@@ -547,7 +548,7 @@ class BackgroundJobOptions:
547548
ref_id: Optional[str] = None
548549
parent_id: Optional[int] = None
549550
worker: Optional[str] = None
550-
run_after: Optional[datetime.datetime] = None
551+
run_after: Optional[datetime] = None
551552
callback: Optional[str] = None
552553
depends_on: Optional[int] = None
553554
user_id: Optional[str] = None
@@ -557,7 +558,7 @@ class BackgroundJobOptions:
557558
batch_id: Optional[str] = None
558559
created_by: Optional[str] = None
559560
timeout_secs: Optional[int] = None
560-
timeout: Optional[datetime.timedelta] = None
561+
timeout: Optional[timedelta] = None
561562
args: Optional[Dict[str, str]] = None
562563
run_command: Optional[bool] = None
563564

@@ -566,14 +567,14 @@ class BackgroundJobOptions:
566567
class ScheduledTask:
567568
id: int = 0
568569
name: Optional[str] = None
569-
interval: Optional[datetime.timedelta] = None
570+
interval: Optional[timedelta] = None
570571
cron_expression: Optional[str] = None
571572
request_type: Optional[str] = None
572573
command: Optional[str] = None
573574
request: Optional[str] = None
574575
request_body: Optional[str] = None
575576
options: Optional[BackgroundJobOptions] = None
576-
last_run: Optional[datetime.datetime] = None
577+
last_run: Optional[datetime] = None
577578
last_job_id: Optional[int] = None
578579

579580
@dataclass_json(letter_case=LetterCase.CAMEL, undefined=Undefined.EXCLUDE)

0 commit comments

Comments
 (0)