Skip to content

Commit 8007116

Browse files
authored
Refinery reduction (#267)
* Removes overview charts but label distribution * Remove record IDE * Removes ide reference from start * Submodule merge & remove unused
1 parent 2db6c54 commit 8007116

File tree

12 files changed

+3
-568
lines changed

12 files changed

+3
-568
lines changed

app.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
from fast_api.routes.heuristic import router as heuristic_router
3030
from fast_api.routes.data_browser import router as data_browser_router
3131
from fast_api.routes.labeling import router as labeling_router
32-
from fast_api.routes.record_ide import router as record_ide_router
3332
from fast_api.routes.record import router as record_router
3433
from fast_api.routes.weak_supervision import router as weak_supervision_router
3534
from fast_api.routes.labeling_tasks import router as labeling_tasks_router
@@ -54,7 +53,6 @@
5453
PREFIX_HEURISTIC,
5554
PREFIX_DATA_BROWSER,
5655
PREFIX_LABELING,
57-
PREFIX_RECORD_IDE,
5856
PREFIX_RECORD,
5957
PREFIX_WEAK_SUPERVISION,
6058
PREFIX_LABELING_TASKS,
@@ -100,9 +98,6 @@
10098
data_browser_router, prefix=PREFIX_DATA_BROWSER, tags=["data-browser"]
10199
)
102100
fastapi_app.include_router(labeling_router, prefix=PREFIX_LABELING, tags=["labeling"])
103-
fastapi_app.include_router(
104-
record_ide_router, prefix=PREFIX_RECORD_IDE, tags=["record-ide"]
105-
),
106101
fastapi_app.include_router(record_router, prefix=PREFIX_RECORD, tags=["record"]),
107102
fastapi_app.include_router(
108103
weak_supervision_router, prefix=PREFIX_WEAK_SUPERVISION, tags=["weak-supervision"]

controller/project/manager.py

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
from controller.labeling_access_link import manager as link_manager
99
from submodules.model import Project, enums
1010
from submodules.model.business_objects import (
11-
labeling_task,
1211
organization,
1312
project,
1413
record,
@@ -42,10 +41,6 @@ def get_project(project_id: str) -> Project:
4241
return project.get(project_id)
4342

4443

45-
def get_project_with_labeling_tasks(project_id: str) -> Project:
46-
return project.get_with_labling_tasks(project_id)
47-
48-
4944
def get_project_with_labeling_tasks_info_attributes(project_id: str) -> Project:
5045
return project.get_with_labling_tasks_info_attributes(project_id)
5146

@@ -109,10 +104,6 @@ def get_max_running_id(project_id: str) -> int:
109104
return project.get_max_running_id(project_id)
110105

111106

112-
def is_rats_tokenization_still_running(project_id: str) -> bool:
113-
return project.is_rats_tokenization_still_running(project_id)
114-
115-
116107
def create_project(
117108
organization_id: str, name: str, description: str, user_id: str
118109
) -> Project:
@@ -202,31 +193,6 @@ def get_label_distribution(
202193
return project.get_label_distribution(project_id, labeling_task_id, slice_id)
203194

204195

205-
def get_confidence_distribution(
206-
project_id: str,
207-
labeling_task_id: str,
208-
slice_id: Optional[str] = None,
209-
num_samples: Optional[int] = None,
210-
) -> str:
211-
return project.get_confidence_distribution(
212-
project_id, labeling_task_id, slice_id, num_samples
213-
)
214-
215-
216-
def get_confusion_matrix(
217-
project_id: str,
218-
labeling_task_id: str,
219-
slice_id: Optional[str] = None,
220-
) -> str:
221-
for_classification = (
222-
labeling_task.get(project_id, labeling_task_id).task_type
223-
== enums.LabelingTaskType.CLASSIFICATION.value
224-
)
225-
return project.get_confusion_matrix(
226-
project_id, labeling_task_id, for_classification, slice_id
227-
)
228-
229-
230196
def resolve_request_huddle_data(
231197
project_id: str, user_id: str, data_id: str, huddle_type: str
232198
) -> HuddleData:

controller/record_ide/__init__.py

Whitespace-only changes.

controller/record_ide/manager.py

Lines changed: 0 additions & 7 deletions
This file was deleted.

fast_api/models.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,6 @@ class UploadCredentialsAndIdBody(BaseModel):
107107
key: Optional[StrictStr] = None
108108

109109

110-
class RecordIdeBody(BaseModel):
111-
code: StrictStr
112-
113-
114110
class NotificationsBody(BaseModel):
115111
project_filter: List[StrictStr]
116112
level_filter: List[StrictStr]

fast_api/routes/project.py

Lines changed: 2 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,13 @@
1111
)
1212
from fastapi import APIRouter, Body, Depends, Request
1313
from fast_api.routes.client_response import pack_json_result
14-
from typing import Dict, List
14+
from typing import Dict
1515
from controller.auth import manager as auth_manager
1616
from controller.attribute import manager as attr_manager
17-
from controller.labeling_task import manager as task_manager
1817
from controller.upload_task import manager as upload_task_manager
1918
from submodules.model.business_objects import information_source, labeling_task
20-
from submodules.model import enums, events
19+
from submodules.model import enums
2120
from submodules.model.business_objects.embedding import get_all_embeddings_by_project_id
22-
from submodules.model.enums import LabelingTaskType
2321
from submodules.model.business_objects.project import get_project_by_project_id_sql
2422
from submodules.model.business_objects.labeling_task import (
2523
get_labeling_tasks_by_project_id_full,
@@ -33,10 +31,6 @@
3331
to_frontend_obj_raw,
3432
)
3533
from util import notification
36-
from util.inter_annotator.functions import (
37-
resolve_inter_annotator_matrix_classification,
38-
resolve_inter_annotator_matrix_extraction,
39-
)
4034
from controller.misc import manager as misc
4135
from exceptions.exceptions import NotAllowedInOpenSourceError
4236
from submodules.model.business_objects import notification as notification_model
@@ -137,87 +131,6 @@ def general_project_stats(
137131
)
138132

139133

140-
@router.get(
141-
"/{project_id}/inter-annotator-matrix",
142-
dependencies=[Depends(auth_manager.check_project_access_dep)],
143-
)
144-
def inter_annotator_matrix(
145-
project_id: str,
146-
labeling_task_id: str,
147-
include_gold_star: Optional[bool] = True,
148-
include_all_org_user: Optional[bool] = False,
149-
only_on_static_slice: Optional[str] = None,
150-
) -> Dict:
151-
152-
labeling_task = task_manager.get_labeling_task(project_id, labeling_task_id)
153-
if not labeling_task:
154-
raise ValueError("Can't match labeling task to given Ids")
155-
fp = None
156-
if labeling_task.task_type == LabelingTaskType.CLASSIFICATION.value:
157-
fp = resolve_inter_annotator_matrix_classification
158-
elif labeling_task.task_type == LabelingTaskType.INFORMATION_EXTRACTION.value:
159-
fp = resolve_inter_annotator_matrix_extraction
160-
else:
161-
raise ValueError(f"Can't match task type {labeling_task.task_type}")
162-
163-
return pack_json_result(
164-
{
165-
"data": {
166-
"interAnnotatorMatrix": fp(
167-
labeling_task,
168-
include_gold_star,
169-
include_all_org_user,
170-
only_on_static_slice,
171-
)
172-
}
173-
},
174-
wrap_for_frontend=False, # not wrapped as the prepared results in snake_case are still the expected form the frontend
175-
)
176-
177-
178-
@router.get(
179-
"/{project_id}/confusion-matrix",
180-
dependencies=[Depends(auth_manager.check_project_access_dep)],
181-
)
182-
def confusion_matrix(
183-
project_id: str,
184-
labeling_task_id: str,
185-
slice_id: Optional[str] = None,
186-
) -> Dict:
187-
return pack_json_result(
188-
{
189-
"data": {
190-
"confusionMatrix": manager.get_confusion_matrix(
191-
project_id, labeling_task_id, slice_id
192-
)
193-
}
194-
},
195-
wrap_for_frontend=False, # not wrapped as the prepared results in snake_case are still the expected form the frontend
196-
)
197-
198-
199-
@router.get(
200-
"/{project_id}/confidence-distribution",
201-
dependencies=[Depends(auth_manager.check_project_access_dep)],
202-
)
203-
def confidence_distribution(
204-
project_id: str,
205-
labeling_task_id: Optional[str] = None,
206-
slice_id: Optional[str] = None,
207-
num_samples: int = 100,
208-
) -> List:
209-
return pack_json_result(
210-
{
211-
"data": {
212-
"confidenceDistribution": manager.get_confidence_distribution(
213-
project_id, labeling_task_id, slice_id, num_samples
214-
)
215-
}
216-
},
217-
wrap_for_frontend=False, # not wrapped as the prepared results in snake_case are still the expected form the frontend
218-
)
219-
220-
221134
@router.get(
222135
"/{project_id}/label-distribution",
223136
dependencies=[Depends(auth_manager.check_project_access_dep)],
@@ -386,19 +299,6 @@ def get_model_provider_info(request: Request) -> Dict:
386299
return pack_json_result({"data": {"modelProviderInfo": data}})
387300

388301

389-
@router.get(
390-
"/{project_id}/rats-running",
391-
dependencies=[Depends(auth_manager.check_project_access_dep)],
392-
)
393-
def is_rats_running(
394-
request: Request,
395-
project_id: str,
396-
) -> Dict:
397-
398-
data = manager.is_rats_tokenization_still_running(project_id)
399-
return pack_json_result({"data": {"isRatsTokenizationStillRunning": data}})
400-
401-
402302
@router.get(
403303
"/{project_id}/last-export-credentials",
404304
dependencies=[Depends(auth_manager.check_project_access_dep)],

fast_api/routes/record_ide.py

Lines changed: 0 additions & 30 deletions
This file was deleted.

route_prefix.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
PREFIX_HEURISTIC = PREFIX + "/heuristic"
1313
PREFIX_DATA_BROWSER = PREFIX + "/data-browser"
1414
PREFIX_LABELING = PREFIX + "/labeling"
15-
PREFIX_RECORD_IDE = PREFIX + "/record-ide"
1615
PREFIX_RECORD = PREFIX + "/record"
1716
PREFIX_WEAK_SUPERVISION = PREFIX + "/weak-supervision"
1817
PREFIX_LABELING_TASKS = PREFIX + "/labeling-tasks"

start

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ docker run -d --rm \
5454
-e AC_EXEC_ENV_IMAGE=registry.dev.kern.ai/code-kern-ai/refinery-ac-exec-env:dev$IS_ARM64 \
5555
-e LF_EXEC_ENV_IMAGE=registry.dev.kern.ai/code-kern-ai/refinery-lf-exec-env:dev$IS_ARM64 \
5656
-e ML_EXEC_ENV_IMAGE=registry.dev.kern.ai/code-kern-ai/refinery-ml-exec-env:dev$IS_ARM64 \
57-
-e RECORD_IDE_IMAGE=registry.dev.kern.ai/code-kern-ai/refinery-record-ide-env:dev$IS_ARM64 \
5857
-e LF_NETWORK=dev-setup_default \
5958
-e S3_ENDPOINT="http://$HOST_IP:7053" \
6059
-e S3_ENDPOINT_LOCAL=object-storage:9000 \

0 commit comments

Comments
 (0)