From 5c5b1083128b03ee3d504fd17539eb0a5d329617 Mon Sep 17 00:00:00 2001 From: yuji38kwmt Date: Tue, 24 Dec 2019 15:45:34 +0900 Subject: [PATCH 1/2] update model --- annofabapi/generated_api2.py | 28 ++++++++++ annofabapi/models.py | 26 +++++++++ generate/swagger/swagger-api-components.yaml | 15 +++++ generate/swagger/swagger.v2.yaml | 58 +++++++++++++++++++- generate/swagger/swagger.yaml | 17 +++++- 5 files changed, 142 insertions(+), 2 deletions(-) diff --git a/annofabapi/generated_api2.py b/annofabapi/generated_api2.py index 288d94aa..4144ed18 100644 --- a/annofabapi/generated_api2.py +++ b/annofabapi/generated_api2.py @@ -58,6 +58,34 @@ def get_annotation_specs_v2(self, project_id: str, query_params: Optional[Dict[s } return self._request_wrapper(http_method, url_path, **keyword_params) + ######################################### + # Public Method : AfOrganizationV2Api + # NOTE: This method is auto generated by OpenAPI Generator + ######################################### + + def get_project_task_count_v2(self, organization_id: str, project_id: str, + **kwargs) -> Tuple[Any, requests.Response]: + """プロジェクトのタスク件数取得 + + + authorizations: SignedCookieKeyPairId, SignedCookiePolicy, SignedCookieSignature + + + + Args: + organization_id (str): 組織ID (required) + project_id (str): プロジェクトID (required) + + Returns: + Tuple[ProjectTaskCounts, requests.Response] + + + """ + url_path = f'/organizations/{organization_id}/projects/{project_id}/task-counts' + http_method = 'GET' + keyword_params: Dict[str, Any] = {} + return self._request_wrapper(http_method, url_path, **keyword_params) + ######################################### # Public Method : AfProjectMemberV2Api # NOTE: This method is auto generated by OpenAPI Generator diff --git a/annofabapi/models.py b/annofabapi/models.py index 4d61124c..1e83ecbb 100644 --- a/annofabapi/models.py +++ b/annofabapi/models.py @@ -2699,6 +2699,32 @@ class ProjectStatus(Enum): * last_tasks_updated_datetime: str +""" + +ProjectTaskCounts = Dict[str, Any] +""" + + +Kyes of Dict + +* task_counts: List[ProjectTaskCountsTaskCounts] + + +""" + +ProjectTaskCountsTaskCounts = Dict[str, Any] +""" + + +Kyes of Dict + +* phase: TaskPhase + +* status: TaskStatus + +* count: float + 該当するタスクの数 + """ ProjectTaskStatistics = Dict[str, Any] diff --git a/generate/swagger/swagger-api-components.yaml b/generate/swagger/swagger-api-components.yaml index c45f7c8a..0c556086 100644 --- a/generate/swagger/swagger-api-components.yaml +++ b/generate/swagger/swagger-api-components.yaml @@ -3553,3 +3553,18 @@ type: string description: UnknownLabel example: "UnknownLabel" + ProjectTaskCounts: + type: object + properties: + task_counts: + type: array + items: + type: object + properties: + phase: + $ref: "#/components/schemas/TaskPhase" + status: + $ref: "#/components/schemas/TaskStatus" + count: + description: 該当するタスクの数 + type: number diff --git a/generate/swagger/swagger.v2.yaml b/generate/swagger/swagger.v2.yaml index 9ec254fe..5468e5d1 100644 --- a/generate/swagger/swagger.v2.yaml +++ b/generate/swagger/swagger.v2.yaml @@ -76,7 +76,7 @@ info: WebhookID | プロジェクト内で一意 入力データセットID | 組織内で一意 - version: 0.68.0 + version: 0.68.1 title: AnnoFab Web API x-logo: url: "https://annofab.com/images/logo_landscape.png" @@ -92,6 +92,9 @@ tags: - name: af-cache-v2 x-displayName: Cache description: キャッシュに関係 +- name: af-organization-v2 + x-displayName: Organization + description: 組織に対する操作 - name: af-project-member-v2 x-displayName: Project Member description: プロジェクトメンバーに対する操作 @@ -106,6 +109,7 @@ x-tagGroups: tags: - af-annotation-specs-v2 - af-cache-v2 + - af-organization-v2 - af-project-member-v2 - af-project-v2 - af-statistics-v2 @@ -579,6 +583,43 @@ paths: $ref: "#/components/responses/ErrorMissingResource" 503: $ref: "#/components/responses/ErrorUnderMaintenance" + /organizations/{organization_id}/projects/{project_id}/task-counts: + get: + tags: + - af-organization-v2 + summary: プロジェクトのタスク件数取得 + description: | + security: + - SignedCookieKeyPairId: [] + SignedCookiePolicy: [] + SignedCookieSignature: [] + operationId: getProjectTaskCountV2 + parameters: + - name: organization_id + in: path + description: 組織ID + required: true + schema: + $ref: "#/components/schemas/OrganizationId" + - name: project_id + in: path + description: プロジェクトID + required: true + schema: + $ref: "#/components/schemas/ProjectId" + responses: + 200: + description: 正常 + content: + application/json: + schema: + $ref: "#/components/schemas/ProjectTaskCounts" + 401: + $ref: "#/components/responses/ErrorUnauthorizedApi" + 404: + $ref: "#/components/responses/ErrorMissingResource" + 503: + $ref: "#/components/responses/ErrorUnderMaintenance" components: securitySchemes: SignedCookieKeyPairId: @@ -4135,3 +4176,18 @@ components: type: string description: UnknownLabel example: "UnknownLabel" + ProjectTaskCounts: + type: object + properties: + task_counts: + type: array + items: + type: object + properties: + phase: + $ref: "#/components/schemas/TaskPhase" + status: + $ref: "#/components/schemas/TaskStatus" + count: + description: 該当するタスクの数 + type: number diff --git a/generate/swagger/swagger.yaml b/generate/swagger/swagger.yaml index 03bd891e..08c61005 100644 --- a/generate/swagger/swagger.yaml +++ b/generate/swagger/swagger.yaml @@ -76,7 +76,7 @@ info: WebhookID | プロジェクト内で一意 入力データセットID | 組織内で一意 - version: 0.68.0 + version: 0.68.1 title: AnnoFab Web API x-logo: url: "https://annofab.com/images/logo_landscape.png" @@ -8108,3 +8108,18 @@ components: type: string description: UnknownLabel example: "UnknownLabel" + ProjectTaskCounts: + type: object + properties: + task_counts: + type: array + items: + type: object + properties: + phase: + $ref: "#/components/schemas/TaskPhase" + status: + $ref: "#/components/schemas/TaskStatus" + count: + description: 該当するタスクの数 + type: number From cd8afc117b856f65efd87b8e64efb387c98e95f6 Mon Sep 17 00:00:00 2001 From: yuji38kwmt Date: Tue, 24 Dec 2019 15:47:49 +0900 Subject: [PATCH 2/2] version up --- annofabapi/__version__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/annofabapi/__version__.py b/annofabapi/__version__.py index db714a85..5a983c9e 100644 --- a/annofabapi/__version__.py +++ b/annofabapi/__version__.py @@ -1 +1 @@ -__version__ = '0.23.1' +__version__ = '0.23.2'