Merge pull request #1933 from kili-technology/lab-3807-optimise-create-issues

fix(LAB-3807): remove retrieval of asset ids when creating issues

Author: josselinbuils

src/kili/adapters/kili_api_gateway/issue/__init__.py

@@ -16,6 +16,7 @@
 from kili.core.constants import MUTATION_BATCH_SIZE
 from kili.core.utils.pagination import batcher
 from kili.domain.issue import IssueFilters, IssueId, IssueStatus, IssueType
+from kili.domain.project import ProjectId
 from kili.domain.types import ListOrTuple
 from kili.utils import tqdm
 
@@ -27,13 +28,16 @@ class IssueOperationMixin(BaseOperationMixin):
     """GraphQL Mixin extending GraphQL Gateway class with Issue related operations."""
 
     def create_issues(
-        self, type_: IssueType, issues: List[IssueToCreateKiliAPIGatewayInput], description: str
+        self,
+        project_id: ProjectId,
+        type_: IssueType,
+        issues: List[IssueToCreateKiliAPIGatewayInput],
+        description: str,
     ) -> List[IssueId]:
         """Send a GraphQL request calling createIssues resolver."""
         created_issue_entities: List[IssueId] = []
         with tqdm.tqdm(total=len(issues), desc=description) as pbar:
             for issues_batch in batcher(issues, batch_size=MUTATION_BATCH_SIZE):
-                batch_targeted_asset_ids = [issue.asset_id for issue in issues_batch]
                 payload = {
                     "issues": [
                         {
@@ -46,7 +50,7 @@ def create_issues(
                         }
                         for issue in issues_batch
                     ],
-                    "where": {"idIn": batch_targeted_asset_ids},
+                    "where": {"project": {"id": project_id}},
                 }
                 result = self.graphql_client.execute(GQL_CREATE_ISSUES, payload)
                 batch_created_issues = result["data"]

src/kili/adapters/kili_api_gateway/issue/types.py

@@ -10,5 +10,5 @@ class IssueToCreateKiliAPIGatewayInput:
 
     label_id: Optional[str]
     object_mid: Optional[str]
-    asset_id: str
+    asset_id: Optional[str]
     text: Optional[str]

src/kili/use_cases/issue/__init__.py

@@ -7,7 +7,6 @@
 from kili.domain.issue import IssueFilters, IssueId, IssueStatus
 from kili.domain.project import ProjectId
 from kili.domain.types import ListOrTuple
-from kili.entrypoints.mutations.issue.helpers import get_labels_asset_ids_map
 from kili.use_cases.base import BaseUseCases
 from kili.use_cases.issue.types import IssueToCreateUseCaseInput
 
@@ -19,21 +18,20 @@ def create_issues(
         self, project_id: ProjectId, issues: List[IssueToCreateUseCaseInput]
     ) -> List[IssueId]:
         """Create issues with issue type."""
-        label_id_array = [issue.label_id for issue in issues]
-        label_asset_ids_map = get_labels_asset_ids_map(
-            self._kili_api_gateway, project_id, label_id_array
-        )  # TODO: should be done in the backend
         gateway_issues = [
             IssueToCreateKiliAPIGatewayInput(
+                asset_id=None,
                 label_id=issue.label_id,
                 object_mid=issue.object_mid,
-                asset_id=label_asset_ids_map[issue.label_id],
                 text=issue.text,
             )
             for issue in issues
         ]
         return self._kili_api_gateway.create_issues(
-            type_="ISSUE", issues=gateway_issues, description="Creating issues"
+            project_id=project_id,
+            type_="ISSUE",
+            issues=gateway_issues,
+            description="Creating issues",
         )
 
     def count_issues(self, filters: IssueFilters) -> int:

src/kili/use_cases/question/question_use_case.py

@@ -55,6 +55,9 @@ def create_questions(
         return [
             QuestionId(str(id_))
             for id_ in self._kili_api_gateway.create_issues(
-                type_="QUESTION", issues=gateway_issues, description="Creating questions"
+                project_id=project_id,
+                type_="QUESTION",
+                issues=gateway_issues,
+                description="Creating questions",
             )
         ]

tests/integration/use_cases/test_issue.py

@@ -14,9 +14,6 @@
 
 
 def test_create_one_issue(kili_api_gateway: KiliAPIGateway, mocker: pytest_mock.MockerFixture):
-    mocker.patch(
-        "kili.use_cases.issue.get_labels_asset_ids_map", return_value={"label_id": "asset_id"}
-    )
     kili_api_gateway.create_issues.return_value = [IssueId("created_issue_id")]
 
     # given one issue to create

tests/integration/use_cases/test_question.py

@@ -38,6 +38,7 @@ def test_given_text_and_asset_ids_when_calling_create_questions_it_creates_quest
     # Then
     assert len(question_ids) == 2
     kili_api_gateway.create_issues.assert_called_once_with(
+        project_id=project_id,
         type_="QUESTION",
         issues=[
             IssueToCreateKiliAPIGatewayInput(
@@ -94,6 +95,7 @@ def test_given_text_and_external_ids_when_calling_create_questions_it_creates_qu
     # Then
     assert len(question_ids) == 2
     kili_api_gateway.create_issues.assert_called_once_with(
+        project_id=project_id,
         type_="QUESTION",
         issues=[
             IssueToCreateKiliAPIGatewayInput(