diff --git a/.gitignore b/.gitignore index 468fc3e80..438f466f9 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,6 @@ __pycache__/ *.py[cod] *$py.class -notebooks/ full_run.ipynb evals/ diff --git a/README.md b/README.md index 196e8f449..8599c0120 100644 --- a/README.md +++ b/README.md @@ -65,16 +65,21 @@ You can use different LLM providers, for more info check out our =3.9 or backports.zoneinfo library. +# Any required deps can installed by adding `alembic[tz]` to the pip requirements +# string value is passed to ZoneInfo() +# 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 = newline +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 = %(SQLALCHEMY_DATABASE_URI)s + + +[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 + +# lint with attempts to fix using "ruff" - use the exec runner, execute a binary +# hooks = ruff +# ruff.type = exec +# ruff.executable = %(here)s/.venv/bin/ruff +# ruff.options = --fix 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 diff --git a/alembic/README b/alembic/README new file mode 100644 index 000000000..e0d0858f2 --- /dev/null +++ b/alembic/README @@ -0,0 +1 @@ +Generic single-database configuration with an async dbapi. \ No newline at end of file diff --git a/alembic/env.py b/alembic/env.py new file mode 100644 index 000000000..fe501d6cd --- /dev/null +++ b/alembic/env.py @@ -0,0 +1,106 @@ +import asyncio +from logging.config import fileConfig + +from sqlalchemy import pool +from sqlalchemy.engine import Connection +from sqlalchemy.ext.asyncio import async_engine_from_config + +from alembic import context + +# this is the Alembic Config object, which provides +# access to the values within the .ini file in use. +config = context.config + +# Interpret the config file for Python logging. +# This line sets up loggers basically. +if config.config_file_name is not None: + fileConfig(config.config_file_name) + +# add your model's MetaData object here +# for 'autogenerate' support +# from myapp import mymodel +# target_metadata = mymodel.Base.metadata +from cognee.infrastructure.databases.relational import Base +target_metadata = Base.metadata + +# other values from the config, defined by the needs of env.py, +# can be acquired: +# my_important_option = config.get_main_option("my_important_option") +# ... etc. + + +def run_migrations_offline() -> None: + """Run migrations in 'offline' mode. + + This configures the context with just a URL + and not an Engine, though an Engine is acceptable + here as well. By skipping the Engine creation + we don't even need a DBAPI to be available. + + Calls to context.execute() here emit the given string to the + script output. + + """ + url = config.get_main_option("sqlalchemy.url") + context.configure( + url=url, + target_metadata=target_metadata, + literal_binds=True, + dialect_opts={"paramstyle": "named"}, + ) + + with context.begin_transaction(): + context.run_migrations() + + +def do_run_migrations(connection: Connection) -> None: + context.configure(connection=connection, target_metadata=target_metadata) + + with context.begin_transaction(): + context.run_migrations() + + +async def run_async_migrations() -> None: + """In this scenario we need to create an Engine + and associate a connection with the context. + """ + + connectable = async_engine_from_config( + config.get_section(config.config_ini_section, {}), + prefix="sqlalchemy.", + poolclass=pool.NullPool, + ) + + async with connectable.connect() as connection: + await connection.run_sync(do_run_migrations) + + await connectable.dispose() + + +def run_migrations_online() -> None: + """Run migrations in 'online' mode.""" + + asyncio.run(run_async_migrations()) + + +from cognee.infrastructure.databases.relational import get_relational_engine, get_relational_config + +db_engine = get_relational_engine() + +if db_engine.engine.dialect.name == "sqlite": + from cognee.infrastructure.files.storage import LocalStorage + db_config = get_relational_config() + LocalStorage.ensure_directory_exists(db_config.db_path) + +config.set_section_option( + config.config_ini_section, + "SQLALCHEMY_DATABASE_URI", + db_engine.db_uri, +) + + +if context.is_offline_mode(): + print("OFFLINE MODE") + run_migrations_offline() +else: + run_migrations_online() diff --git a/alembic/script.py.mako b/alembic/script.py.mako new file mode 100644 index 000000000..fbc4b07dc --- /dev/null +++ b/alembic/script.py.mako @@ -0,0 +1,26 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision | comma,n} +Create Date: ${create_date} + +""" +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +# revision identifiers, used by Alembic. +revision: str = ${repr(up_revision)} +down_revision: Union[str, None] = ${repr(down_revision)} +branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)} +depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)} + + +def upgrade() -> None: + ${upgrades if upgrades else "pass"} + + +def downgrade() -> None: + ${downgrades if downgrades else "pass"} diff --git a/alembic/versions/8057ae7329c2_initial_migration.py b/alembic/versions/8057ae7329c2_initial_migration.py new file mode 100644 index 000000000..d7d45d0ac --- /dev/null +++ b/alembic/versions/8057ae7329c2_initial_migration.py @@ -0,0 +1,26 @@ +"""Initial migration + +Revision ID: 8057ae7329c2 +Revises: +Create Date: 2024-10-02 12:55:20.989372 + +""" +from typing import Sequence, Union +from sqlalchemy.util import await_only +from cognee.infrastructure.databases.relational import get_relational_engine + +# revision identifiers, used by Alembic. +revision: str = "8057ae7329c2" +down_revision: Union[str, None] = None +branch_labels: Union[str, Sequence[str], None] = None +depends_on: Union[str, Sequence[str], None] = None + + +def upgrade() -> None: + db_engine = get_relational_engine() + await_only(db_engine.create_database()) + + +def downgrade() -> None: + db_engine = get_relational_engine() + await_only(db_engine.delete_database()) diff --git a/cognee-frontend/src/ui/Partials/SearchView/SearchView.tsx b/cognee-frontend/src/ui/Partials/SearchView/SearchView.tsx index d2bafefb7..b20beb5b9 100644 --- a/cognee-frontend/src/ui/Partials/SearchView/SearchView.tsx +++ b/cognee-frontend/src/ui/Partials/SearchView/SearchView.tsx @@ -25,23 +25,40 @@ export default function SearchView() { }, []); const searchOptions = [{ - value: 'SIMILARITY', - label: 'Look for similar graph nodes', + value: 'INSIGHTS', + label: 'Query insights from documents', }, { - value: 'SUMMARY', - label: 'Get a summary related to query', + value: 'SUMMARIES', + label: 'Query document summaries', }, { - value: 'ADJACENT', - label: 'Look for graph node\'s neighbors', - }, { - value: 'TRAVERSE', - label: 'Traverse through the graph and get knowledge', + value: 'CHUNKS', + label: 'Query document chunks', }]; const [searchType, setSearchType] = useState(searchOptions[0]); + const scrollToBottom = useCallback(() => { + setTimeout(() => { + const messagesContainerElement = document.getElementById('messages'); + if (messagesContainerElement) { + const messagesElements = messagesContainerElement.children[0]; + + if (messagesElements) { + messagesContainerElement.scrollTo({ + top: messagesElements.scrollHeight, + behavior: 'smooth', + }); + } + } + }, 300); + }, []); + const handleSearchSubmit = useCallback((event: React.FormEvent) => { event.preventDefault(); + if (inputValue.trim() === '') { + return; + } + setMessages((currentMessages) => [ ...currentMessages, { @@ -51,16 +68,18 @@ export default function SearchView() { }, ]); + scrollToBottom(); + + const searchTypeValue = searchType.value; + fetch('/v1/search', { method: 'POST', headers: { 'Content-Type': 'application/json', }, body: JSON.stringify({ - query_params: { - query: inputValue, - searchType: searchType.value, - }, + query: inputValue, + searchType: searchTypeValue, }), }) .then((response) => response.json()) @@ -70,12 +89,14 @@ export default function SearchView() { { id: v4(), user: 'system', - text: systemMessage, + text: convertToSearchTypeOutput(systemMessage, searchTypeValue), }, ]); setInputValue(''); + + scrollToBottom(); }) - }, [inputValue, searchType]); + }, [inputValue, scrollToBottom, searchType.value]); const { value: isInputExpanded, @@ -83,6 +104,12 @@ export default function SearchView() { setFalse: contractInput, } = useBoolean(false); + const handleSubmitOnEnter = (event: React.KeyboardEvent) => { + if (event.key === 'Enter' && !event.shiftKey) { + handleSearchSubmit(event as unknown as React.FormEvent); + } + }; + return ( @@ -90,7 +117,7 @@ export default function SearchView() { options={searchOptions} onChange={setSearchType} /> -
+
{messages.map((message) => (
-