Skip to content

Commit

Permalink
Chat History Supported! (#58)
Browse files Browse the repository at this point in the history
* alembic stuff

* docker

* added db models and logic for saving chats

* chat history endpoint connected to frontend

* backend for chat history final

* frontend code for chat history

* bug fixes

* final working!
  • Loading branch information
rashadphz authored Jun 27, 2024
1 parent 1e9d339 commit 339367a
Show file tree
Hide file tree
Showing 40 changed files with 1,277 additions and 169 deletions.
46 changes: 0 additions & 46 deletions docker-compose-no-searxng.yaml

This file was deleted.

25 changes: 25 additions & 0 deletions docker-compose.dev.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
services:
backend:
depends_on:
- postgres
build:
context: .
dockerfile: ./src/backend/Dockerfile
Expand All @@ -18,6 +20,14 @@ services:
- SEARXNG_BASE_URL=${SEARXNG_BASE_URL:-http://host.docker.internal:8080}
- CUSTOM_MODEL=${CUSTOM_MODEL}
- REDIS_URL=${REDIS_URL}
- DB_ENABLED=${DB_ENABLED:-True}
- POSTGRES_HOST=postgres
entrypoint: >
/bin/sh -c "
cd /workspace/src/backend &&
alembic upgrade head &&
uvicorn main:app --host 0.0.0.0 --port 8000
"
develop:
watch:
- action: sync
Expand Down Expand Up @@ -58,5 +68,20 @@ services:
environment:
- SEARXNG_BASE_URL=https://${SEARXNG_BASE_URL:-localhost}/

postgres:
image: postgres:15.2-alpine
restart: always
environment:
- POSTGRES_USER=${POSTGRES_USER:-postgres}
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password}
- POSTGRES_DB=${POSTGRES_DB:-postgres}
ports:
- "5432:5432"
volumes:
- db_volume:/var/lib/postgresql/data

networks:
searxng:

volumes:
db_volume:
3 changes: 3 additions & 0 deletions docker-scripts/env-defaults
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,6 @@ export NEXT_PUBLIC_LOCAL_MODE_ENABLED=${NEXT_PUBLIC_LOCAL_MODE_ENABLED:-true}

# Redis
export REDIS_URL=${REDIS_URL}

# Database
export DB_ENABLED=${DB_ENABLED:-True}
121 changes: 120 additions & 1 deletion poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ slowapi = "^0.1.9"
redis = "^5.0.4"
llama-index-llms-ollama = "^0.1.3"
llama-index-llms-litellm = "^0.1.4"
alembic = "^1.13.1"
psycopg2-binary = "^2.9.9"

[tool.poetry.group.dev.dependencies]
pre-commit = "^3.7.1"
Expand Down
110 changes: 110 additions & 0 deletions src/backend/alembic.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
# A generic, single database configuration.

[alembic]
# path to migration scripts
script_location = alembic

# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
# Uncomment the line below if you want the files to be prepended with date and time
# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file
# for all available tokens
# file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s

# sys.path path, will be prepended to sys.path if present.
# defaults to the current working directory.
prepend_sys_path = .

# timezone to use when rendering the date within the migration file
# as well as the filename.
# If specified, requires the python-dateutil library that can be
# installed by adding `alembic[tz]` to the pip requirements
# string value is passed to dateutil.tz.gettz()
# leave blank for localtime
# timezone =

# max length of characters to apply to the
# "slug" field
# truncate_slug_length = 40

# set to 'true' to run the environment during
# the 'revision' command, regardless of autogenerate
# revision_environment = false

# set to 'true' to allow .pyc and .pyo files without
# a source .py file to be detected as revisions in the
# versions/ directory
# sourceless = false

# version location specification; This defaults
# to alembic/versions. When using multiple version
# directories, initial revisions must be specified with --version-path.
# The path separator used here should be the separator specified by "version_path_separator" below.
# version_locations = %(here)s/bar:%(here)s/bat:alembic/versions

# version path separator; As mentioned above, this is the character used to split
# version_locations. The default within new alembic.ini files is "os", which uses os.pathsep.
# If this key is omitted entirely, it falls back to the legacy behavior of splitting on spaces and/or commas.
# Valid values for version_path_separator are:
#
# version_path_separator = :
# version_path_separator = ;
# version_path_separator = space
version_path_separator = os # Use os.pathsep. Default configuration used for new projects.

# set to 'true' to search source files recursively
# in each "version_locations" directory
# new in Alembic version 1.10
# recursive_version_locations = false

# the output encoding used when revision files
# are written from script.py.mako
# output_encoding = utf-8

; sqlalchemy.url = driver://user:pass@localhost/dbname


[post_write_hooks]
# post_write_hooks defines scripts or Python functions that are run
# on newly generated revision scripts. See the documentation for further
# detail and examples

# format using "black" - use the console_scripts runner, against the "black" entrypoint
# hooks = black
# black.type = console_scripts
# black.entrypoint = black
# black.options = -l 79 REVISION_SCRIPT_FILENAME

# Logging configuration
[loggers]
keys = root,sqlalchemy,alembic

[handlers]
keys = console

[formatters]
keys = generic

[logger_root]
level = WARN
handlers = console
qualname =

[logger_sqlalchemy]
level = WARN
handlers =
qualname = sqlalchemy.engine

[logger_alembic]
level = INFO
handlers =
qualname = alembic

[handler_console]
class = StreamHandler
args = (sys.stderr,)
level = NOTSET
formatter = generic

[formatter_generic]
format = %(levelname)-5.5s [%(name)s] %(message)s
datefmt = %H:%M:%S
Loading

0 comments on commit 339367a

Please sign in to comment.