Skip to content
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.

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

Email in API key #59

Open
wants to merge 23 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
441a830
Added custom handling for verifying API keys contain valid emails (an…
MichaelRipa Sep 26, 2024
c59a88f
Streaming working with nnsight streaming
JadenFiotto-Kaufman Sep 27, 2024
afb6492
Use redis instead of rabbitmq. Logic for handling websocket disconnec…
JadenFiotto-Kaufman Sep 29, 2024
6bc9f7c
Added basic live update script
MichaelRipa Oct 2, 2024
f53df0d
Added automatic conda environment updates for service rebuilds
MichaelRipa Oct 2, 2024
2fa60a0
cleanup
MichaelRipa Oct 2, 2024
e6d8626
Added docstring and debug mode
MichaelRipa Oct 2, 2024
932d62a
Set cuda env to be all gpus in base model deployment if no gpus speci…
JadenFiotto-Kaufman Oct 7, 2024
2f66083
API environment requires redis not pika (RMQ ) now
JadenFiotto-Kaufman Oct 7, 2024
c4605ab
Merge remote-tracking branch 'origin/dev' into streaming-protocol
JadenFiotto-Kaufman Oct 7, 2024
f96dc7f
Merge pull request #67 from ndif-team/streaming-protocol
AdamBelfki3 Oct 21, 2024
96576d5
Fix handing of dtensors. Set cuda vis devices to all if none provided
JadenFiotto-Kaufman Oct 28, 2024
98bc4eb
Merge branch 'streaming-protocol' into 0.4
JadenFiotto-Kaufman Oct 28, 2024
537c853
Ndif working with 0.4 ! streaming protocol next
JadenFiotto-Kaufman Oct 31, 2024
c4c6760
Bug was suppressing remote exceptions to the user
JadenFiotto-Kaufman Nov 1, 2024
af4063a
Removed update Makefile target
MichaelRipa Nov 4, 2024
b72e6ba
removed update script
MichaelRipa Nov 4, 2024
47e7f2e
Streaming local <-> remote
JadenFiotto-Kaufman Nov 7, 2024
d2cc9b6
Merge branch '0.4' of https://github.com/ndif-team/ndif into live-upd…
MichaelRipa Nov 13, 2024
0c9bec8
Corrected nnsight repo branch
MichaelRipa Nov 13, 2024
dee43ec
Merge pull request #62 from ndif-team/live-updates
JadenFiotto-Kaufman Nov 13, 2024
4718037
Merge branch '0.4' of https://github.com/ndif-team/ndif into api-key/…
MichaelRipa Nov 13, 2024
8f0db54
Fixed slugify path for 405b
MichaelRipa Nov 13, 2024
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
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,11 @@ build_base:
docker build --no-cache -t $(NAME)_base:latest -f ../base.dockerfile .

build_service:

cp ../check_and_update_env.sh ./
tar -hczvf src.tar.gz src

docker build --no-cache --build-arg NAME=$(NAME) -t $(NAME):latest -f ../service.dockerfile .

rm src.tar.gz
rm ./check_and_update_env.sh

build_all_base:

Expand Down
9 changes: 4 additions & 5 deletions compose/dev/.env
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# RabbitMQ Ports
DEV_RABBITMQ_PORT=5673
RABBITMQ_INTERNAL_PORT=5672
# Broker Ports
DEV_BROKER_PORT=6379
BROKER_INTERNAL_PORT=6379
BROKER_PROTOCOL=redis://

# MinIO Ports
DEV_MINIO_PORT=27018
Expand Down Expand Up @@ -42,8 +43,6 @@ LOKI_INTERNAL_PORT=3100
N_DEVICES=$N_DEVICES

# Credentials and Other Configs
RABBITMQ_DEFAULT_USER=guest
RABBITMQ_DEFAULT_PASS=guest
GRAFANA_ADMIN_USER=admin
GRAFANA_ADMIN_PASSWORD=admin
HOST_IP=$HOST_IP
Expand Down
11 changes: 4 additions & 7 deletions compose/dev/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
services:
rabbitmq:
image: rabbitmq:3.11.28
environment:
RABBITMQ_DEFAULT_USER: ${RABBITMQ_DEFAULT_USER}
RABBITMQ_DEFAULT_PASS: ${RABBITMQ_DEFAULT_PASS}
message_broker:
image: redis:latest
ports:
- ${DEV_RABBITMQ_PORT}:${RABBITMQ_INTERNAL_PORT}
- ${DEV_BROKER_PORT}:${BROKER_INTERNAL_PORT}

minio:
image: minio/minio:latest
Expand Down Expand Up @@ -48,7 +45,7 @@ services:
- ${DEV_API_PORT}:${API_INTERNAL_PORT}
environment:
OBJECT_STORE_URL: ${HOST_IP}:${DEV_MINIO_PORT}
RMQ_URL: amqp://${RABBITMQ_DEFAULT_USER}:${RABBITMQ_DEFAULT_PASS}@${HOST_IP}:${DEV_RABBITMQ_PORT}/
BROKER_URL: ${BROKER_PROTOCOL}@${HOST_IP}:${DEV_BROKER_PORT}/
WORKERS: 1
RAY_ADDRESS: ray://${HOST_IP}:${DEV_RAY_CLIENT_PORT}
LOKI_URL: http://${HOST_IP}:${DEV_LOKI_PORT}/loki/api/v1/push
Expand Down
2 changes: 1 addition & 1 deletion compose/dev/service_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ request_import_path: src.ray.deployments.request:app
request_num_replicas: 1
models:

- model_key: 'nnsight.models.LanguageModel.LanguageModel:{"repo_id": "openai-community/gpt2"}'
- model_key: 'nnsight.modeling.language.LanguageModel:{"repo_id": "openai-community/gpt2"}'
ray_actor_options:
num_gpus: 1
num_replicas: 1
Expand Down
4 changes: 2 additions & 2 deletions load_testing/LocustBackend.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
from typing import Any

from nnsight.contexts.backends.RemoteBackend import RemoteBackend, RemoteMixin
from nnsight.schema.Request import RequestModel
from nnsight.schema.Response import ResponseModel
from nnsight.schema.request import RequestModel
from nnsight.schema.response import ResponseModel
import requests
import socketio
from tqdm import tqdm
Expand Down
Loading