Skip to content

Service agent deploy changes #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
officialid130-13e13 wants to merge 1 commit into
base: Feature/AI-Suggestion
Choose a base branch
from
+28 −1
Open

Service agent deploy changes #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions development/api.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,14 @@ DF_PRODUCTION_DB_PASSWORD=pwd
# Mail settings
DF_MAIL_DELIVERY_METHOD=test

# TorchServe inference key
TORCHSERVE_INFERENCE_KEY=dwQSgtJ4 #dE5alekH

# Set proxy
HTTP_PROXY=http://192.168.65.1:3128
HTTPS_PROXY=http://192.168.65.1:3128

# url add
TORCHSERVE_URL=http://effort-predictor:8080/predictions/effort-predictor


16 changes: 16 additions & 0 deletions development/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ services:
- ../data/student-work:/student-work
depends_on:
- dev-db
- effort-predictor # add dependency
environment:
RAILS_ENV: 'development'

Expand Down Expand Up @@ -83,6 +84,21 @@ services:
# Redis
DF_REDIS_SIDEKIQ_URL: redis://df-compose-redis-sidekiq:6379/0

# TorchServe Inference Key
TORCHSERVE_INFERENCE_KEY: dwQSgtJ4 #dE5alekH
TORCHSERVE_URL: "http://effort-predictor:8080/predictions/effort-predictor"

effort-predictor: # TorchServe service
image: pytorch/torchserve:latest
ports:
- "8080:8080"
volumes:
# - ./model_store:/home/model-server/model-store
- ../doubtfire-api/ml_services/model_store:/home/model-server/model-store
- ../doubtfire-api/ml_services/key_file.json:/home/model-server/key_file.json
#command: ["torchserve", "--start", "--model-store", "model_store", "--models", "effort-predictor=effort-predictor.mar"]
command: ["torchserve", "--start", "--model-store", "/home/model-server/model-store", "--models", "effort-predictor=effort-predictor.mar"]

doubtfire-web:
container_name: doubtfire-web
image: lmsdoubtfire/doubtfire-web:8.0.x-dev
Expand Down
2 changes: 1 addition & 1 deletion doubtfire-api
Open in desktop
Submodule doubtfire-api updated 65 files
+6 −6 .github/workflows/push.yml
+20 −0 .gitignore
+81 −0 CHANGELOG.md
+2 −0 Gemfile
+3 −0 Gemfile.lock
+19 −0 app/api/admin/overseer_admin_api.rb
+2 −0 app/api/api_root.rb
+2 −0 app/api/entities/project_entity.rb
+8 −0 app/api/entities/task_definition_entity.rb
+21 −0 app/api/entities/tutor_note_entity.rb
+3 −0 app/api/entities/unit_entity.rb
+15 −0 app/api/entities/unit_role_entity.rb
+15 −6 app/api/overseer_steps_api.rb
+8 −1 app/api/task_comments_api.rb
+43 −1 app/api/task_definitions_api.rb
+122 −13 app/api/tasks_api.rb
+178 −0 app/api/tutor_notes_api.rb
+5 −1 app/api/tutorials_api.rb
+137 −1 app/api/unit_roles_api.rb
+68 −2 app/api/units_api.rb
+192 −1 app/controllers/task_downloads_controller.rb
+16 −0 app/models/comments/task_feedback_review_request_comment.rb
+17 −0 app/models/moderated_task.rb
+4 −0 app/models/overflow_task_claim.rb
+3 −0 app/models/overseer_assessment.rb
+6 −0 app/models/project.rb
+83 −0 app/models/task.rb
+36 −0 app/models/task_definition.rb
+3 −0 app/models/task_definition_grade_due_date.rb
+1 −1 app/models/task_prerequisite.rb
+4 −0 app/models/tutor_feedback_score.rb
+14 −0 app/models/tutor_note.rb
+174 −0 app/models/unit.rb
+48 −2 app/models/unit_role.rb
+78 −0 app/services/effort_prediction_service.rb
+19 −3 app/sidekiq/accept_overseer_job.rb
+11 −1 app/sidekiq/accept_submission_job.rb
+7 −0 config/application.rb
+2 −0 config/routes.rb
+62 −0 db/migrate/20260113033152_add_moderation_feat.rb
+16 −0 db/migrate/20260222043513_create_task_definition_grade_due_dates.rb
+7 −0 db/migrate/20260223064434_add_target_grade_start_dates.rb
+14 −0 db/migrate/20260224222539_add_overflow_marking.rb
+68 −1 db/schema.rb
+16 −0 ml_services/dummy_model.py
+ − ml_services/effort_model.pth
+50 −0 ml_services/handlers/effort_regression_handler.py
+13 −0 ml_services/key_file.json
+ − ml_services/model_store/effort-predictor.mar
+16 −0 ml_services/models/effort_model.py
+9 −0 ml_services/scripts/build_mar.sh
+3 −3 test/api/projects_api_test.rb
+195 −51 test/api/tutorials_test.rb
+9 −3 test/api/units_api_test.rb
+5 −0 test/factories/moderated_tasks.rb
+5 −0 test/factories/overflow_task_claims.rb
+5 −0 test/factories/task_definition_grade_due_dates.rb
+5 −0 test/factories/tutor_feedback_scores.rb
+4 −0 test/factories/tutor_notes.rb
+7 −0 test/models/moderated_task_test.rb
+7 −0 test/models/overflow_task_claim_test.rb
+7 −0 test/models/task_definition_grade_due_date_test.rb
+42 −42 test/models/task_prerequisite_test.rb
+7 −0 test/models/tutor_feedback_score_test.rb
+7 −0 test/models/tutor_note_test.rb