Skip to content

Commit

Permalink
Merge branch 'main' into sk/pipeline-validations
Browse files Browse the repository at this point in the history
  • Loading branch information
snopoke authored Jan 17, 2025
2 parents 49f60f7 + 91bf738 commit 40fa59c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion api-schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ paths:
schema:
$ref: '#/components/schemas/ExperimentSessionWithMessages'
description: ''
/api/trigger_bot/:
/api/trigger_bot:
post:
operationId: trigger_bot_message
description: Trigger the bot to send a message to the user
Expand Down
10 changes: 6 additions & 4 deletions apps/api/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,18 @@
router.register(r"sessions", views.ExperimentSessionViewSet, basename="session")

connect_patterns = [
path("generate_key/", views.generate_key, name="generate_key"),
path("callback/", views.callback, name="callback"),
path("consent/", views.consent, name="consent"),
path("generate_key", views.generate_key, name="generate_key"),
path("callback", views.callback, name="callback"),
path("consent", views.consent, name="consent"),
]

urlpatterns = [
path("participants/", views.update_participant_data, name="update-participant-data"),
# Duplicate update-participant-data without a trailing "/" for backwards compatibility
path("participants", views.update_participant_data, name="update-participant-data"),
path("openai/<uuid:experiment_id>/chat/completions", openai.chat_completions, name="openai-chat-completions"),
path("files/<int:pk>/content", views.file_content_view, name="file-content"),
path("commcare_connect/", include((connect_patterns, "commcare-connect"))),
path("trigger_bot/", views.trigger_bot_message, name="trigger_bot"),
path("trigger_bot", views.trigger_bot_message, name="trigger_bot"),
path("", include(router.urls)),
]
3 changes: 1 addition & 2 deletions apps/channels/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,5 @@
),
path("whatsapp/turn/<uuid:experiment_id>/incoming_message", views.new_turn_message, name="new_turn_message"),
path("api/<uuid:experiment_id>/incoming_message", views.new_api_message, name="new_api_message"),
# TODO: Remove trailing / and update endpoint at ConnectID
path("commcare_connect/incoming_message/", views.new_connect_message, name="new_connect_message"),
path("commcare_connect/incoming_message", views.new_connect_message, name="new_connect_message"),
]

0 comments on commit 40fa59c

Please sign in to comment.