Skip to content

Commit

Permalink
Merge branch 'main' into embeddings
Browse files Browse the repository at this point in the history
  • Loading branch information
@lone17
lone17 authored Apr 8, 2024
2 parents 6ccd236 + 8001c86 commit 48351ba
Show file tree
Hide file tree
Showing 13 changed files with 239 additions and 145 deletions.
2 changes: 1 addition & 1 deletion libs/kotaemon/pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies = [
"theflow",
"llama-index>=0.9.0,<0.10.0",
"llama-hub",
"gradio>=4.0.0",
"gradio>=4.0.0,<=4.22.0",
"openpyxl",
"cookiecutter",
"click",
Expand Down
27 changes: 10 additions & 17 deletions libs/ktem/flowsettings.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,38 +73,37 @@

if config("OPENAI_API_KEY", default=""):
KH_LLMS["openai"] = {
"def": {
"spec": {
"__type__": "kotaemon.llms.ChatOpenAI",
"temperature": 0,
"openai_api_base": config("OPENAI_API_BASE", default="")
"base_url": config("OPENAI_API_BASE", default="")
or "https://api.openai.com/v1",
"openai_api_key": config("OPENAI_API_KEY", default=""),
"api_key": config("OPENAI_API_KEY", default=""),
"model": config("OPENAI_CHAT_MODEL", default="") or "gpt-3.5-turbo",
"request_timeout": 10,
"stream": False,
"timeout": 10,
},
"default": False,
}
if len(KH_EMBEDDINGS) < 1:
KH_EMBEDDINGS["openai"] = {
"def": {
"spec": {
"__type__": "kotaemon.embeddings.LCOpenAIEmbeddings",
"openai_api_base": config("OPENAI_API_BASE", default="")
"base_url": config("OPENAI_API_BASE", default="")
or "https://api.openai.com/v1",
"openai_api_key": config("OPENAI_API_KEY", default=""),
"api_key": config("OPENAI_API_KEY", default=""),
"model": config(
"OPENAI_EMBEDDINGS_MODEL", default="text-embedding-ada-002"
)
or "text-embedding-ada-002",
"request_timeout": 10,
"timeout": 10,
"chunk_size": 16,
},
"default": False,
}

if config("LOCAL_MODEL", default=""):
KH_LLMS["local"] = {
"def": {
"spec": {
"__type__": "kotaemon.llms.EndpointChatLLM",
"endpoint_url": "http://localhost:31415/v1/chat/completions",
},
Expand All @@ -113,7 +112,7 @@
}
if len(KH_EMBEDDINGS) < 1:
KH_EMBEDDINGS["local"] = {
"def": {
"spec": {
"__type__": "kotaemon.embeddings.EndpointEmbeddings",
"endpoint_url": "http://localhost:31415/v1/embeddings",
},
Expand Down Expand Up @@ -164,10 +163,4 @@
"config": {},
"index_type": "ktem.index.file.FileIndex",
},
{
"id": 2,
"name": "Sample",
"config": {},
"index_type": "ktem.index.file.FileIndex",
},
]
5 changes: 1 addition & 4 deletions libs/ktem/ktem/app.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,7 @@ class BaseApp:
def __init__(self):
self.dev_mode = getattr(settings, "KH_MODE", "") == "dev"
self.f_user_management = getattr(settings, "KH_FEATURE_USER_MANAGEMENT", False)
self._theme = gr.themes.Base(
font=("ui-sans-serif", "system-ui", "sans-serif"),
font_mono=("ui-monospace", "Consolas", "monospace"),
)
self._theme = gr.Theme.from_hub("lone17/kotaemon")

dir_assets = Path(__file__).parent / "assets"
with (dir_assets / "css" / "main.css").open() as fi:
Expand Down
114 changes: 90 additions & 24 deletions libs/ktem/ktem/assets/css/main.css
View file
Original file line number Diff line number Diff line change
@@ -1,55 +1,91 @@
/* no footer */
footer {
display: none !important;
display: none !important;
}

/* customize scrollbar */
::-webkit-scrollbar {
background: var(--background-fill-primary);
}
::-webkit-scrollbar-thumb {
background-color: var(--border-color-primary);
border: 4px solid transparent;
border-radius: 100px;
background-clip: content-box;
}
::-webkit-scrollbar-corner {
background: var(--border-color-primary);
}

.gradio-container {
max-width: 100% !important;
padding: 0 !important;
max-width: 100% !important;
}

/* styling for header bar */
.header-bar {
background-color: #f7f7f7;
margin: 0px 0px 20px;
overflow-x: scroll;
display: block !important;
text-wrap: nowrap;
background-color: transparent;
margin: 0px 0px 20px;
overflow-x: scroll;
display: block !important;
text-wrap: nowrap;
border: none;
}
.header-bar button.selected {
border: none;

.dark .header-bar {
border: none !important;
background-color: #8080802b !important;
/* an alternative header bar style with rounded background */
/* background-color: var(--background-fill-primary);
border: 4px solid transparent;
border-radius: var(--radius-lg);
background-clip: padding-box; */
}

.header-bar button.selected {
border-radius: 0;
/* selected buttons have highlighted text */
button.selected {
color: var(--block-label-text-color);
font-weight: bold;
}

#chat-tab,
#settings-tab,
#help-tab,
#resources-tab,
#login-tab {
border: none !important;
}

.indices-tab {
border: none !important;
#help-tab,
#settings-tab {
/* text-dense view should not be wide for readability */
max-width: max(56vw, 900px) !important;
margin: 0 auto !important;
}

#chat-tab, #settings-tab, #help-tab, #admin-tab, #login-tab {
border: none !important;
.indices-tab,
#resources-tab {
/* Other view should not be too wide */
border: none !important;
max-width: max(70vw, 1200px) !important;
margin: 0 auto !important;
}

#main-chat-bot {
height: calc(100vh - 140px) !important;
/* span the chat area to occupy full height minus space for chat input */
height: calc(100vh - 180px) !important;
}

#chat-info-panel {
max-height: calc(100vh - 140px) !important;
overflow-y: scroll !important;
max-height: calc(100vh - 180px) !important;
overflow-y: scroll !important;
}

.setting-answer-mode-description {
margin: 5px 5px 2px !important
margin: 5px 5px 2px !important;
}

mark {
*/ mark {
background-color: #1496bb;
}


/* clpse */
.clpse {
background-color: var(--background-fill-secondary);
Expand All @@ -61,3 +97,33 @@ mark {
text-align: left;
outline: none;
}

/* for setting transparent background for elements */
.no-background {
background-color: transparent;
border: none;
}

/* for setting bold text for elements */
.bold-text {
font-weight: bold;
}

/* for setting highlighted text for elements */
.body-text-color {
color: var(--body-text-color);
}

/* for setting right-aligned buttons */
.right-button {
min-width: 200px !important;
width: fit-content;
padding-left: 20px;
padding-right: 20px;
margin: 0px 0px 0px auto;
}

/* for setting height limit for buttons */
.cap-height {
max-height: 42px;
}
97 changes: 57 additions & 40 deletions libs/ktem/ktem/index/file/ui.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,49 +97,66 @@ def upload_instruction(self) -> str:

def on_building_ui(self):
"""Build the UI of the app"""
with gr.Accordion(label="File upload", open=True) as self.upload:
msg = self.upload_instruction()
if msg:
gr.Markdown(msg)

self.files = File(
file_types=self._supported_file_types,
file_count="multiple",
container=False,
)
with gr.Accordion("Advanced indexing options", open=False):
with gr.Row():
self.reindex = gr.Checkbox(
value=False, label="Force reindex file", container=False
with gr.Row():
with gr.Column(scale=1):
gr.Markdown("## File Upload")
with gr.Column() as self.upload:
msg = self.upload_instruction()
if msg:
gr.Markdown(msg)

self.files = File(
file_types=self._supported_file_types,
file_count="multiple",
container=True,
)
with gr.Accordion("Advanced indexing options", open=True):
with gr.Row():
self.reindex = gr.Checkbox(
value=False, label="Force reindex file", container=False
)

self.upload_button = gr.Button(
"Upload and Index", variant="primary"
)
self.file_output = gr.File(
visible=False, label="Output files (debug purpose)"
)

self.upload_button = gr.Button("Upload and Index")
self.file_output = gr.File(
visible=False, label="Output files (debug purpose)"
)

gr.Markdown("## File list")
self.file_list_state = gr.State(value=None)
self.file_list = gr.DataFrame(
headers=["id", "name", "size", "text_length", "date_created"],
interactive=False,
)

with gr.Row() as self.selection_info:
self.selected_file_id = gr.State(value=None)
self.selected_panel = gr.Markdown(self.selected_panel_false)
self.deselect_button = gr.Button("Deselect", visible=False)
with gr.Column(scale=4):
gr.Markdown("## File List")
self.file_list_state = gr.State(value=None)
self.file_list = gr.DataFrame(
headers=["id", "name", "size", "text_length", "date_created"],
interactive=False,
)

with gr.Row() as self.tools:
with gr.Column():
self.view_button = gr.Button("View Text (WIP)")
with gr.Column():
self.delete_button = gr.Button("Delete")
with gr.Row():
self.delete_yes = gr.Button(
"Confirm Delete", variant="primary", visible=False
)
self.delete_no = gr.Button("Cancel", visible=False)
with gr.Row() as self.selection_info:
self.selected_file_id = gr.State(value=None)
with gr.Column(scale=2):
self.selected_panel = gr.Markdown(self.selected_panel_false)
with gr.Column(scale=1):
self.deselect_button = gr.Button(
"Deselect",
scale=1,
visible=False,
elem_classes=["right-button"],
)

self.delete_button = gr.Button(
"Delete", variant="stop", elem_classes=["right-button"]
)
self.delete_yes = gr.Button(
"Confirm Delete",
variant="stop",
visible=False,
elem_classes=["right-button"],
)
self.delete_no = gr.Button(
"Cancel",
visible=False,
elem_classes=["right-button"],
)

def on_subscribe_public_events(self):
"""Subscribe to the declared public event of the app"""
Expand Down
14 changes: 9 additions & 5 deletions libs/ktem/ktem/llms/ui.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,17 @@ def on_building_ui(self):

with gr.Row(visible=False) as self._selected_panel_btn:
with gr.Column():
self.btn_edit_save = gr.Button("Save", min_width=10)
self.btn_edit_save = gr.Button(
"Save", min_width=10, variant="primary"
)
with gr.Column():
self.btn_delete = gr.Button("Delete", min_width=10)
self.btn_delete = gr.Button(
"Delete", min_width=10, variant="stop"
)
with gr.Row():
self.btn_delete_yes = gr.Button(
"Confirm delete",
variant="primary",
"Confirm Delete",
variant="stop",
visible=False,
min_width=10,
)
Expand Down Expand Up @@ -98,7 +102,7 @@ def on_building_ui(self):
"by default across the application."
),
)
self.btn_new = gr.Button("Create LLM")
self.btn_new = gr.Button("Add LLM", variant="primary")

with gr.Column(scale=3):
self.spec_desc = gr.Markdown(self.spec_desc_default)
Expand Down
Loading

0 comments on commit 48351ba

Please sign in to comment.