Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Core/Google Drive datasource #135

Merged
merged 43 commits into from
Nov 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
9b29644
chore: Add Google Drive env configs to template files.
osala-eng Oct 27, 2023
e94e67d
chore: Add Google Drive env configs to template files.
osala-eng Oct 27, 2023
1beff9b
chore: Add Google Drive API modules to .toml files.
osala-eng Oct 27, 2023
5cfe7aa
feat: Add UI for requesting google Authorization
osala-eng Oct 27, 2023
c187a18
feat: Create Google Drive API helper service
osala-eng Oct 27, 2023
598d907
feat: Create Google Drive data source
osala-eng Oct 27, 2023
870c265
chore: Create a local credentials store.
osala-eng Oct 27, 2023
6a54215
chore: Setup first draft of Google Drive data source.
osala-eng Oct 27, 2023
c73935a
fix: Update data_source base reader.
osala-eng Oct 27, 2023
c0fe0dc
chore: Try using opendal to load gdrive and switch to local loader if…
osala-eng Oct 27, 2023
1c57ab0
chore: Update services init method
osala-eng Oct 28, 2023
032a010
chore: Update env templates.
osala-eng Oct 28, 2023
f387855
chore: Update env templates.
osala-eng Oct 28, 2023
4cb974a
chore: Update GDrive data source.
osala-eng Oct 28, 2023
b8fb4c5
chore: Fix minor bugs.
osala-eng Oct 28, 2023
fa374fc
chore: Added support for arguments in ConfigKeyHandlers.
osala-eng Oct 28, 2023
403ff67
chore: Added support for arguments in ConfigKeyHandlers.
osala-eng Oct 28, 2023
8066178
chore: Allow indexer to use filenames when downloading files from Goo…
osala-eng Oct 28, 2023
4ca779a
chore: Remove test in google drive module __doc__.
osala-eng Oct 29, 2023
6fb2289
chore: Make google drive downloader async.
osala-eng Oct 29, 2023
b900d5e
chore: Enable downloading google doc files as pdf.
osala-eng Oct 29, 2023
51ff552
chore: Update base reader.
osala-eng Oct 29, 2023
0a90eaf
chore: Update create space UI for Google Drive."
osala-eng Nov 4, 2023
f2bc79a
chore: Update GDrive credential request.
osala-eng Nov 4, 2023
c4ad8c4
chore: Update layout.
osala-eng Nov 4, 2023
aa4a92f
chore: Update Google Drive credential request UI.
osala-eng Nov 4, 2023
553be18
chore: Only make api calls to Google Drive if no saved settings.
osala-eng Nov 4, 2023
77c41af
chore: Handle error in query params.
osala-eng Nov 4, 2023
b726c24
chore: Add a TODO note for Google Drive reader.
osala-eng Nov 8, 2023
5c9bcbc
chore: Add __doc__ for the domain module.
osala-eng Nov 9, 2023
fcd6480
chore: Update domains module.
osala-eng Nov 9, 2023
f10ee3a
chore: Add File storage service handlers.
osala-eng Nov 9, 2023
aae68c6
chore: Cleanup files.
osala-eng Nov 9, 2023
714161d
fix: shared space selector (#146)
osala-eng Nov 9, 2023
cb134ef
Merge branch 'main' of github.com:docqai/docq into core/g-drive-datas…
osala-eng Nov 10, 2023
a92c108
Update web/utils/layout.py
osala-eng Nov 10, 2023
608b646
chore: Remove ConfigKeyHandlers from config file.
osala-eng Nov 18, 2023
d0208f0
chore: Update google drive datasource credential retrieval.
osala-eng Nov 18, 2023
36f5dfc
chore: Cleanup unused content.
osala-eng Nov 18, 2023
536b64b
chore: Fix minor bugs.
osala-eng Nov 18, 2023
251faf3
chore: Rename create space defaults function.
osala-eng Nov 20, 2023
6679a1a
fix: Clear form values after creating space.
osala-eng Nov 20, 2023
69fa1b2
feat: Add an option to make datasource optional.
osala-eng Nov 21, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -192,5 +192,9 @@ docker.env
# ignore Infisical config file
.infisical.json

# ignore google drive api credentials
credentials.json
token.json

# ignore default docq extensions
.docq-extensions.json
4 changes: 4 additions & 0 deletions misc/docker.env.template
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ DOCQ_SMTP_LOGIN="SMTP-LOGIN" # The username for logging in to the SMTP service
DOCQ_SMTP_KEY="SMTP-MASTER-PASSWORD" # The password for logging in to the SMTP service
DOCQ_SMTP_FROM="Docq.AI Support <[email protected]>" # A custom sender email

# GOOGLE_DRIVE_API
DOCQ_GOOGLE_APPLICATION_CREDENTIALS=credentials.json # Credentials containing Docq project configs
DOCQ_GOOGLE_AUTH_REDIRECT_URL=http://localhost:8501/authorize_gdrive # The URL configured for redirect in google console.

# SERVER SETTINGS
DOCQ_SERVER_ADDRESS = "http://localhost:8501" # Web address for the docq server, used for generating verification urls.

Expand Down
4 changes: 4 additions & 0 deletions misc/secrets.toml.template
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ DOCQ_SMTP_LOGIN = "SMTP-LOGIN" # The username for logging in to the SMTP service
DOCQ_SMTP_KEY = "SMTP-MASTER-PASSWORD" # The password for logging in to the SMTP service
DOCQ_SMTP_FROM = "Docq.AI Support <[email protected]>" # A custom sender email

# GOOGLE_DRIVE_API
DOCQ_GOOGLE_APPLICATION_CREDENTIALS = "credentials.json" # Credentials containing Docq project configs
DOCQ_GOOGLE_AUTH_REDIRECT_URL = "http://localhost:8501/authorize_gdrive" # The URL configured for redirect in google console.

# SERVER SETTINGS
DOCQ_SERVER_ADDRESS = "http://localhost:8501" # Web address for the docq server, used for generating verification urls.
OTEL_SERVICE_NAME = "docq-" #for local dev "docq-dev-<yourname>". Prod "docq-prod"
Expand Down
234 changes: 216 additions & 18 deletions poetry.lock

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

7 changes: 5 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ pypdf = "^3.9.0"
docx2txt = "^0.8"
argon2-cffi = "^21.3.0"
azure-core = "^1.27.1"
opendal = "^0.38.1"
opendal = "^0.41.0"
llama-index = "0.8.34"
transformers = "4.33.2"
optimum = { extras = ["exporters"], version = "1.13.2" }
Expand All @@ -43,6 +43,9 @@ opentelemetry-instrumentation-sqlalchemy = "0.41b0"
opentelemetry-instrumentation-tornado = "0.41b0"
opentelemetry-instrumentation-tortoiseorm = "0.41b0"
opentelemetry-instrumentation-urllib3 = "0.41b0"
google-auth-oauthlib = "^1.1.0"
google-api-python-client = "^2.104.0"
google-auth-httplib2 = "^0.1.1"

[tool.poetry.group.dev.dependencies]
pre-commit = "^2.18.1"
Expand Down Expand Up @@ -79,7 +82,7 @@ check = true


[tool.ruff]
ignore = ["E501"]
ignore = ["E501", "ANN401"]
line-length = 120
select = [
"C9",
Expand Down
Loading