Move the django app into the src/khoj folder for better organization and functionality

- Our pypi package currently does not work because the django app and associated database is not included. To remedy this issue, move the app into the src/khoj folder. This has the added benefit of improved organization of the codebase, as all server related code is now in a single folder
- Update associated file paths and system references
This commit is contained in:
sabaimran
2023-11-21 10:56:04 -08:00
parent 6d8e889917
commit a474c31e02
62 changed files with 48 additions and 48 deletions

View File

@@ -26,7 +26,7 @@ from khoj.utils.rawconfig import (
from khoj.utils import state, fs_syncer
from khoj.routers.indexer import configure_content
from khoj.processor.org_mode.org_to_entries import OrgToEntries
from database.models import (
from khoj.database.models import (
KhojApiUser,
LocalOrgConfig,
LocalMarkdownConfig,

View File

@@ -1,7 +1,7 @@
import factory
import os
from database.models import (
from khoj.database.models import (
KhojUser,
KhojApiUser,
ChatModelOptions,

View File

@@ -16,8 +16,8 @@ from khoj.utils.state import search_models, content_index, config
from khoj.search_type import text_search, image_search
from khoj.utils.rawconfig import ContentConfig, SearchConfig
from khoj.processor.org_mode.org_to_entries import OrgToEntries
from database.models import KhojUser, KhojApiUser
from database.adapters import EntryAdapters
from khoj.database.models import KhojUser, KhojApiUser
from khoj.database.adapters import EntryAdapters
# Test

View File

@@ -17,8 +17,8 @@ from khoj.utils.state import search_models, content_index, config
from khoj.search_type import text_search, image_search
from khoj.utils.rawconfig import ContentConfig, SearchConfig
from khoj.processor.org_mode.org_to_entries import OrgToEntries
from database.models import KhojUser, KhojApiUser
from database.adapters import EntryAdapters
from khoj.database.models import KhojUser, KhojApiUser
from khoj.database.adapters import EntryAdapters
# ----------------------------------------------------------------------------------------------------

View File

@@ -10,7 +10,7 @@ from khoj.processor.conversation import prompts
# Internal Packages
from khoj.processor.conversation.utils import message_to_log
from tests.helpers import ConversationFactory
from database.models import KhojUser
from khoj.database.models import KhojUser
# Initialize variables for tests
api_key = os.getenv("OPENAI_API_KEY")

View File

@@ -7,7 +7,7 @@ from pathlib import Path
from khoj.utils.fs_syncer import get_plaintext_files
from khoj.utils.rawconfig import TextContentConfig
from khoj.processor.plaintext.plaintext_to_entries import PlaintextToEntries
from database.models import LocalPlaintextConfig, KhojUser
from khoj.database.models import LocalPlaintextConfig, KhojUser
def test_plaintext_file(tmp_path):

View File

@@ -13,7 +13,7 @@ from khoj.utils.rawconfig import ContentConfig, SearchConfig
from khoj.processor.org_mode.org_to_entries import OrgToEntries
from khoj.processor.github.github_to_entries import GithubToEntries
from khoj.utils.fs_syncer import collect_files, get_org_files
from database.models import LocalOrgConfig, KhojUser, Entry, GithubConfig
from khoj.database.models import LocalOrgConfig, KhojUser, Entry, GithubConfig
logger = logging.getLogger(__name__)