Skip to content

Commit 507b075

Browse files
mkaliberdamkaliberda
authored
[Cherry-Pick-Main][UI][Server]Fixed docker_runner in codegen and cleaned up some config and files (#58)
1 parent e01f8b8 commit 507b075

File tree

9 files changed

+21
-222
lines changed

9 files changed

+21
-222
lines changed

‎docker-compose.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,6 @@ services:
7777
depends_on:
7878
- db
7979
- redis
80-
- sensiml.databse.initalize
81-
nginx:
82-
image: nginx:latest
83-
ports:
84-
- "80:80"
85-
volumes:
86-
- ./nginx/conf.d:/etc/nginx/conf.d
87-
depends_on:
88-
- sensiml.cloud
8980
sensiml.pipelines:
9081
#mem_limit: "2000M"
9182
image: sensiml/base

‎src/server/codegen/docker_runner.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -116,13 +116,8 @@ def build_code_bin(self, build_type, application):
116116
}
117117
)
118118

119-
if settings.INSIDE_LOCAL_DOCKER: # self.is_inside_docker():
120-
bind = {
121-
"piccolo_server_data": {
122-
"bind": "/data",
123-
"mode": "rw",
124-
}
125-
}
119+
if settings.INSIDE_LOCAL_DOCKER:
120+
bind = [f"{settings.LOCAL_DOCKER_SERVER_DATA_VOLUME_NAME}:/data"]
126121
else:
127122
bind = {
128123
self.root_dir: {
@@ -218,6 +213,10 @@ def build_code_bin(self, build_type, application):
218213
finally:
219214
# Remove container on success. Maybe just do it anyway.
220215
client.api.remove_container(resource_id=container_to_run.get("Id"))
216+
elif container_returns["StatusCode"] == 127 and settings.INSIDE_LOCAL_DOCKER:
217+
raise ExitCodeNonZeroException(
218+
f"Model data has missing some files. Please, check the data volume name."
219+
)
221220
else:
222221
raise ExitCodeNonZeroException(container_returns)
223222

‎src/server/datamanager/migrations/0087_lock_schema.py renamed to ‎src/server/datamanager/migrations/0005_lock_schema.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
class Migration(migrations.Migration):
77

88
dependencies = [
9-
("datamanager", "0086_label_info"),
9+
("datamanager", "0004_label_info"),
1010
]
1111

1212
operations = [

‎src/server/datamanager/tasks.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ def pipeline_async(self, user_id, project_id, sandbox_id, err_queue=deque()):
321321
team_member=user.teammember,
322322
)
323323
engine._temp.clean_up_temp()
324-
engine.update_execution_status(
324+
engine.update_team_cpu_usage(
325325
execution_type=PipelineExecution.ExecutionTypeEnum.PIPELINE,
326326
status=PipelineExecution.ExecutionStatusEnum.FAILED,
327327
wall_time=time.time() - start,
@@ -331,7 +331,7 @@ def pipeline_async(self, user_id, project_id, sandbox_id, err_queue=deque()):
331331
e.args = (engine._current_step_info,)
332332
raise e
333333

334-
engine.update_execution_status(
334+
engine.update_team_cpu_usage(
335335
execution_type=PipelineExecution.ExecutionTypeEnum.PIPELINE,
336336
status=PipelineExecution.ExecutionStatusEnum.SUCCESS,
337337
wall_time=time.time() - start,
@@ -570,7 +570,7 @@ def gridsearch_async(
570570
}
571571
)
572572
engine._temp.clean_up_temp()
573-
engine.update_execution_status(
573+
engine.update_team_cpu_usage(
574574
execution_type=PipelineExecution.ExecutionTypeEnum.GRIDSEARCH,
575575
status=PipelineExecution.ExecutionStatusEnum.FAILED,
576576
wall_time=time.time() - start,
@@ -580,7 +580,7 @@ def gridsearch_async(
580580
e.args = (engine._current_step_info,)
581581
raise e
582582

583-
engine.update_execution_status(
583+
engine.update_team_cpu_usage(
584584
execution_type=PipelineExecution.ExecutionTypeEnum.GRIDSEARCH,
585585
status=PipelineExecution.ExecutionStatusEnum.SUCCESS,
586586
wall_time=time.time() - start,
@@ -721,7 +721,7 @@ def auto_async(
721721
team_member=user.teammember,
722722
)
723723
engine._temp.clean_up_temp()
724-
engine.update_execution_status(
724+
engine.update_team_cpu_usage(
725725
execution_type=PipelineExecution.ExecutionTypeEnum.AUTOML,
726726
status=PipelineExecution.ExecutionStatusEnum.FAILED,
727727
wall_time=time.time() - start,
@@ -731,7 +731,7 @@ def auto_async(
731731
e.args = (engine._current_step_info,)
732732
raise e
733733

734-
engine.update_execution_status(
734+
engine.update_team_cpu_usage(
735735
execution_type=PipelineExecution.ExecutionTypeEnum.AUTOML,
736736
status=PipelineExecution.ExecutionStatusEnum.SUCCESS,
737737
wall_time=time.time() - start,
@@ -820,7 +820,7 @@ def autosegment_async(
820820
)
821821

822822
engine._temp.clean_up_temp()
823-
engine.update_execution_status(
823+
engine.update_team_cpu_usage(
824824
execution_type=PipelineExecution.ExecutionTypeEnum.AUTOSEG,
825825
status=PipelineExecution.ExecutionStatusEnum.FAILED,
826826
wall_time=time.time() - start,
@@ -829,7 +829,7 @@ def autosegment_async(
829829
e.args = ({"error": e.args[0]},)
830830
raise e
831831

832-
engine.update_execution_status(
832+
engine.update_team_cpu_usage(
833833
execution_type=PipelineExecution.ExecutionTypeEnum.AUTOSEG,
834834
status=PipelineExecution.ExecutionStatusEnum.SUCCESS,
835835
wall_time=time.time() - start,

‎src/server/datamanager/tests/test_api_views.py

Lines changed: 0 additions & 193 deletions
Original file line numberDiff line numberDiff line change
@@ -257,199 +257,6 @@ def test_labelvalue_create_update(self, client):
257257
assert response.status_code == status.HTTP_400_BAD_REQUEST
258258

259259

260-
@pytest.mark.usefixtures("authenticate")
261-
class TestUser:
262-
@pytest.fixture(autouse=True)
263-
def setup(self, client, request):
264-
self.user = user = TeamMember.objects.get(email="[email protected]").user
265-
client.force_authenticate(user=user)
266-
267-
def test_get_team_subscription(self, client):
268-
response = client.get(reverse("team-subscription"))
269-
270-
assert response.status_code == status.HTTP_200_OK
271-
272-
assert len(response.json()) == 6
273-
274-
data = response.json()
275-
276-
assert data["team"] == "SensimlDevTeam"
277-
assert data["subscription"] == "ENTERPRISE"
278-
assert data["active"] == True
279-
assert data["expires"] == "2084-12-24T17:21:28Z"
280-
281-
testuser = TeamMember.objects.get(email="[email protected]").user
282-
client.force_authenticate(user=testuser)
283-
284-
response = client.get(reverse("team-subscription"))
285-
286-
assert response.status_code == status.HTTP_200_OK
287-
288-
assert len(response.json()) == 6
289-
290-
data = response.json()
291-
292-
assert data["team"] == "StarterTeam"
293-
assert data["subscription"] == "STARTER"
294-
assert data["active"] == True
295-
assert data["expires"] == "2014-12-24T17:21:28Z"
296-
297-
client.force_authenticate(user=self.user)
298-
299-
def test_get_team_subscriptionv2(self, client):
300-
response = client.get(reverse("team-subscription-v2"))
301-
302-
assert response.status_code == status.HTTP_200_OK
303-
304-
assert len(response.json()) == 6
305-
306-
data = response.json()
307-
308-
assert data["team"] == "SensimlDevTeam"
309-
assert data["subscription"]["name"] == "ENTERPRISE"
310-
assert data["active"] == True
311-
assert data["subscription"]["is_read_only"] == False
312-
assert data["subscription"]["can_edit_offline"] == True
313-
assert data["subscription"]["max_project_segments"] == None
314-
assert data["expires"] == "2084-12-24T17:21:28Z"
315-
316-
testuser = TeamMember.objects.get(email="[email protected]").user
317-
client.force_authenticate(user=testuser)
318-
319-
response = client.get(reverse("team-subscription-v2"))
320-
321-
assert response.status_code == status.HTTP_200_OK
322-
323-
assert len(response.json()) == 6
324-
325-
data = response.json()
326-
327-
assert data["team"] == "StarterTeam"
328-
assert data["subscription"]["name"] == "STARTER"
329-
assert data["subscription"]["uuid"] == "56eada75-e049-47bc-bf73-535b8666c91d"
330-
assert data["subscription"]["display_name"] == "Community Edition"
331-
assert data["subscription"]["is_read_only"] == False
332-
assert data["subscription"]["can_edit_offline"] == False
333-
assert data["subscription"]["max_project_segments"] == 2500
334-
assert data["active"] == True
335-
assert data["expires"] == "2014-12-24T17:21:28Z"
336-
337-
client.force_authenticate(user=self.user)
338-
339-
def test_get_options(self, client):
340-
response = client.options(reverse("user-list"))
341-
assert response.data["actions"]["POST"]["email"]["required"] == True
342-
assert response.data["actions"]["POST"]["password"]["required"] == True
343-
344-
def test_create_user(self, client):
345-
data = {"email": "[email protected]", "password": "testpassword"}
346-
response = client.post(reverse("user-list"), data=data)
347-
assert response.status_code == status.HTTP_201_CREATED
348-
response = client.get(response.data["url"])
349-
assert response.status_code == status.HTTP_200_OK
350-
assert response.data["team"] == TEAM_NAME
351-
TeamMember.objects.get(email="[email protected]")
352-
353-
def test_create_user_with_new_team(self, client):
354-
data = {
355-
"email": "[email protected]",
356-
"password": "testpassword",
357-
"team": "new_team",
358-
}
359-
response = client.post(reverse("user-list"), data=data)
360-
assert response.status_code == status.HTTP_201_CREATED
361-
assert response.data["team"] == "new_team"
362-
# check team manager
363-
response.data["email"]
364-
response = client.get(reverse("team-list"))
365-
assert response.status_code == status.HTTP_200_OK
366-
team = next(
367-
(team for team in response.data if team["name"] == "new_team"), None
368-
)
369-
assert team is not None
370-
371-
def test_modify_user_password(self, client):
372-
data = {"email": "[email protected]", "password": "testpassword"}
373-
response = client.post(reverse("user-list"), data=data)
374-
assert response.status_code == status.HTTP_201_CREATED
375-
response = client.patch(response.data["url"], data={"password": "newpassword"})
376-
assert response.status_code == status.HTTP_200_OK
377-
user = User.objects.get(email="[email protected]")
378-
assert user.check_password("newpassword")
379-
380-
381-
class TestActivationCode:
382-
def test_activation_code_creation(self, client):
383-
response = client.post(
384-
reverse("activation-code"),
385-
data={
386-
"authentication": settings.ACTIVATION_CODE_AUTH,
387-
"code": "11111" * 5,
388-
"duration": "90 day",
389-
"subscription": "STARTER",
390-
},
391-
)
392-
393-
assert response.status_code == status.HTTP_201_CREATED
394-
395-
act = ActivationCode.objects.get(code="11111" * 5)
396-
assert act.subscription.id == 1
397-
398-
def test_activation_code_creation_no_duration(self, client):
399-
response = client.post(
400-
reverse("activation-code"),
401-
data={
402-
"authentication": settings.ACTIVATION_CODE_AUTH,
403-
"code": "11111" * 5,
404-
"subscription": "STARTER",
405-
},
406-
)
407-
408-
assert response.status_code == status.HTTP_201_CREATED
409-
410-
act = ActivationCode.objects.get(code="11111" * 5)
411-
assert act.subscription.id == 1
412-
413-
def test_activation_code_invalid(self, client):
414-
response = client.post(
415-
reverse("activation-code"),
416-
data={
417-
"authentication": settings.ACTIVATION_CODE_AUTH,
418-
"code": "11111",
419-
"duration": "90 day",
420-
"subscription": "STARTER",
421-
},
422-
)
423-
424-
assert response.status_code == status.HTTP_400_BAD_REQUEST
425-
426-
def test_subsciption_invalid(self, client):
427-
response = client.post(
428-
reverse("activation-code"),
429-
data={
430-
"authentication": settings.ACTIVATION_CODE_AUTH,
431-
"code": "11111" * 5,
432-
"duration": "90 day",
433-
"subscription": "BLAH",
434-
},
435-
)
436-
437-
assert response.status_code == status.HTTP_400_BAD_REQUEST
438-
439-
def test_authentication_invalid(self, client):
440-
response = client.post(
441-
reverse("activation-code"),
442-
data={
443-
"authentication": "555",
444-
"code": "11111" * 5,
445-
"duration": "90 day",
446-
"subscription": "BLAH",
447-
},
448-
)
449-
450-
assert response.status_code == status.HTTP_400_BAD_REQUEST
451-
452-
453260
class TestSegmenterViews:
454261
@pytest.fixture(autouse=True)
455262
def setup(self, client, authenticate):

‎src/server/datamanager/tests/views/test_capture.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ def test_create_csv_with_timestamp(self, client, project):
227227
from engine.base import pipeline_utils
228228
from datamanager.models import TeamMember
229229

230-
user = TeamMember.objects.get(email="unittest@sensiml.com").user
230+
user = TeamMember.objects.get(email="unittest@piccolo.com").user
231231
capture_df_pipeline_utils, _, _ = pipeline_utils.get_capturefile(
232232
user, project.uuid, capture.name
233233
)

‎src/server/server/settings.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ def load_env(filename=".env", dir=os.path.dirname(__file__)):
159159
CELERY_RDB_PORT=(int, 6899),
160160
DOCKER_HOST_SML_DATA_DIR=(str, ""),
161161
INSIDE_LOCAL_DOCKER=(bool, True),
162-
LOCAL_DOCKER_SERVER_DATA_VOLUMNE_NAME=(str, "sensiml_server_data"),
162+
LOCAL_DOCKER_SERVER_DATA_VOLUME_NAME=(str, "sensiml_server_data"),
163163
FOUNDATION_MODEL_STORE_DOMAIN=(str, "sensiml"),
164164
FOUNDATION_MODEL_STORE_PROJECT=(str, "sensiml"),
165165
ADMIN_SITE_HEADER=(str, "SensiML Account Management"),
@@ -236,7 +236,8 @@ def load_env(filename=".env", dir=os.path.dirname(__file__)):
236236
print("No environment {} found".format(os.environ.get("DJANGO_ENV")))
237237

238238

239-
LOCAL_DOCKER_SERVER_DATA_VOLUMNE_NAME = env("LOCAL_DOCKER_SERVER_DATA_VOLUMNE_NAME")
239+
LOCAL_DOCKER_SERVER_DATA_VOLUME_NAME = env("LOCAL_DOCKER_SERVER_DATA_VOLUME_NAME")
240+
SERVER_NAME = env("SERVER_NAME")
240241
ENVIRONMENT = env("ENVIRONMENT")
241242
FREE_TEAM_PK = env("FREE_TEAM_PK")
242243
SENSIML_LIBRARY_PACK = None

‎src/ui/src/containers/BuildModel/components/PiplineBuilderCustomTraining.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ License along with SensiML Piccolo AI. If not, see <https://www.gnu.org/licenses
2020
import React, { useMemo } from "react";
2121

2222
import { DISABLED_FOR_CUSTOM_STEPS } from "store/autoML/const";
23+
// eslint-disable-next-line import/extensions
2324
import PipelineBuilder from "./PipelineBuilder";
2425

2526
const PipelineBuilderCustomTraining = (props) => {

‎src/ui/src/containers/DownloadModel/TheDownloadModel.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ const DownloadModel = ({
280280
fileDownload(response.data, response.filename);
281281
stopDownloadStatusCheck();
282282
setCompleted(100);
283-
showMessage("success", t("download.success-dowload", { filename: response.filename }));
283+
showMessage("success", t("download.success-download", { filename: response.filename }));
284284
setDownloadingCode(response?.code);
285285
stopDownloadStatusCheck();
286286
} else if (response.status === CANCELED) {

0 commit comments

Comments
 (0)