Skip to content

Commit

Permalink
Revert "Added used_plugin to db message"
Browse files Browse the repository at this point in the history
This reverts commit 213be55.
  • Loading branch information
yk committed May 1, 2023
1 parent 213be55 commit 30d3d42
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 34 deletions.
6 changes: 2 additions & 4 deletions inference/full-dev-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,10 @@ else
INFERENCE_TAG=latest
fi

POSTGRES_PORT=${POSTGRES_PORT:-5432}

# Creates a tmux window with splits for the individual services

tmux new-session -d -s "inference-dev-setup"
tmux send-keys "docker run --rm -it -p $POSTGRES_PORT:5432 -e POSTGRES_PASSWORD=postgres --name postgres postgres" C-m
tmux send-keys "docker run --rm -it -p 5732:5432 -e POSTGRES_PASSWORD=postgres --name postgres postgres" C-m
tmux split-window -h
tmux send-keys "docker run --rm -it -p 6779:6379 --name redis redis" C-m

Expand All @@ -32,7 +30,7 @@ fi

tmux split-window -h
tmux send-keys "cd server" C-m
tmux send-keys "LOGURU_LEVEL=$LOGLEVEL POSTGRES_PORT=$POSTGRES_PORT REDIS_PORT=6779 DEBUG_API_KEYS='0000,0001' ALLOW_DEBUG_AUTH=True TRUSTED_CLIENT_KEYS=6969 uvicorn main:app" C-m
tmux send-keys "LOGURU_LEVEL=$LOGLEVEL POSTGRES_PORT=5732 REDIS_PORT=6779 DEBUG_API_KEYS='0000,0001' ALLOW_DEBUG_AUTH=True TRUSTED_CLIENT_KEYS=6969 uvicorn main:app" C-m
tmux split-window -h
tmux send-keys "cd text-client" C-m
tmux send-keys "sleep 5" C-m
Expand Down

This file was deleted.

2 changes: 0 additions & 2 deletions inference/server/oasst_inference_server/models/chat.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ class DbMessage(SQLModel, table=True):
safety_label: str | None = Field(None)
safety_rots: str | None = Field(None)

used_plugin: inference.PluginUsed | None = Field(None, sa_column=sa.Column(pg.JSONB))

state: inference.MessageState = Field(inference.MessageState.manual)
work_parameters: inference.WorkParameters = Field(None, sa_column=sa.Column(pg.JSONB))
work_begin_at: datetime.datetime | None = Field(None)
Expand Down

0 comments on commit 30d3d42

Please sign in to comment.