-
Notifications
You must be signed in to change notification settings - Fork 91
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
Create a DataGemma UI #4913
Create a DataGemma UI #4913
Changes from 2 commits
dcd54eb
1824353
eb9b494
31ac324
ac445d4
617ef07
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -25,3 +25,4 @@ class Config(_base.Config): | |
HIDE_DEBUG = False | ||
USE_MEMCACHE = False | ||
ENABLE_BQ = True | ||
ENABLE_DATAGEMMA = True |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -40,3 +40,4 @@ typing-extensions==4.10.0 | |
webdriver-manager==4.0.0 | ||
Werkzeug==3.0.6 | ||
wheel==0.38.1 | ||
git+https://github.com/datacommonsorg/llm-tools.git | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We should publish this to pypi down the road to avoid having to do the git dependency install There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. added TODO |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
# Copyright 2025 Google LLC | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
"""Endpoints for DataGemma page""" | ||
|
||
from data_gemma import DataCommons | ||
from data_gemma import GoogleAIStudio | ||
from data_gemma import RAGFlow | ||
from data_gemma import RIGFlow | ||
from data_gemma import VertexAI | ||
import flask | ||
from flask import current_app | ||
from flask import request | ||
|
||
# Define blueprint | ||
bp = flask.Blueprint('dev_datagemma_api', | ||
__name__, | ||
url_prefix='/api/dev/datagemma') | ||
|
||
_RIG_MODE = 'rig' | ||
_RAG_MODE = 'rag' | ||
|
||
# TODO: consider moving these specifications to a config somewhere | ||
_VERTEX_AI_RIG = VertexAI(project_id='datcom-website-dev', | ||
location='us-central1', | ||
prediction_endpoint_id='4999251772590522368') | ||
_VERTEX_AI_RAG = VertexAI(project_id='datcom-website-dev', | ||
location='us-central1', | ||
prediction_endpoint_id='3459865124959944704') | ||
|
||
|
||
def _get_datagemma_answer(query, mode): | ||
dc_nl_service = DataCommons(api_key=current_app.config['DC_NL_API_KEY']) | ||
result = None | ||
if mode == _RIG_MODE: | ||
result = RIGFlow(llm=_VERTEX_AI_RIG, | ||
data_fetcher=dc_nl_service).query(query=query) | ||
elif mode == _RAG_MODE: | ||
gemini_model = GoogleAIStudio( | ||
model='gemini-1.5-pro', api_keys=[current_app.config['GEMINI_API_KEY']]) | ||
result = RAGFlow(llm_question=_VERTEX_AI_RAG, | ||
llm_answer=gemini_model, | ||
data_fetcher=dc_nl_service).query(query=query) | ||
if result: | ||
return result.answer() | ||
else: | ||
return '' | ||
|
||
|
||
@bp.route('/query') | ||
def datagemma_query(): | ||
query = request.args.get('query') | ||
mode = request.args.get('mode') | ||
if not query: | ||
return "error: must provide a query field", 400 | ||
if not mode or mode not in [_RIG_MODE, _RAG_MODE]: | ||
return f'error: must provide a mode field with values {_RIG_MODE} or {_RAG_MODE}', 400 | ||
resp = _get_datagemma_answer(query, mode) | ||
return resp, 200 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
# Copyright 2025 Google LLC | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
"""DataGemma page routes""" | ||
|
||
import flask | ||
|
||
# Define blueprint | ||
bp = flask.Blueprint("dev-datagemma", __name__, url_prefix='/dev/datagemma') | ||
|
||
|
||
@bp.route('/') | ||
def dev_datagemma(): | ||
return flask.render_template('dev/datagemma.html') |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
{# | ||
Copyright 2025 Google LLC | ||
|
||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
#} | ||
{%- extends BASE_HTML -%} | ||
|
||
{% set main_id = 'dev-datagemma' %} | ||
{% set page_id = 'page-dev-datagemma' %} | ||
{% set title = 'Datagemma' %} | ||
{% set is_hide_header_search_bar = 'true' %} | ||
|
||
{% block head %} | ||
<link rel="stylesheet" href={{url_for('static', filename='css/datagemma.min.css')}}> | ||
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons"> | ||
{% endblock %} | ||
|
||
{% block content %} | ||
<div id="datagemma"></div> | ||
{% endblock %} | ||
|
||
{% block footer %} | ||
<script src={{url_for('static', filename='datagemma.js', t=config['GAE_VERSION'])}}></script> | ||
{% endblock %} | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,98 @@ | ||
/** | ||
* Copyright 2025 Google LLC | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
@import "base"; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. For new frontend code, can you look into using "emotion" instead of scss? Examples in the new homepage: https://github.com/datacommonsorg/website/blob/master/static/js/apps/homepage/components/home_hero.tsx#L48 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. done |
||
|
||
#page-dev-datagemma { | ||
height: 100%; | ||
|
||
body { | ||
height: 100%; | ||
} | ||
|
||
#main { | ||
height: 100%; | ||
display: flex; | ||
flex-direction: column; | ||
} | ||
|
||
main { | ||
flex-grow: 1; | ||
width: 100%; | ||
} | ||
} | ||
|
||
#datagemma { | ||
padding: 0 24px; | ||
} | ||
|
||
label { | ||
margin-bottom: 0; | ||
} | ||
|
||
.title { | ||
color: #212529; | ||
font-size: 28px; | ||
font-style: normal; | ||
font-weight: 400; | ||
line-height: 36px; | ||
margin-bottom: 24px; | ||
} | ||
|
||
.inputs { | ||
display: flex; | ||
flex-direction: column; | ||
align-items: flex-start; | ||
gap: 8px; | ||
|
||
.query-input { | ||
display: flex; | ||
align-items: center; | ||
gap: 8px; | ||
width: 100%; | ||
} | ||
|
||
.mode-input { | ||
margin-left: 24px; | ||
width: fit-content; | ||
display: flex; | ||
flex-direction: column; | ||
gap: 8px; | ||
|
||
.mode-option { | ||
display: flex; | ||
align-items: center; | ||
} | ||
} | ||
} | ||
|
||
.answer { | ||
margin-top: 24px; | ||
|
||
p { | ||
margin-top: 1rem; | ||
margin-bottom: 0.3rem; | ||
} | ||
|
||
table, th, td { | ||
border: 1px solid; | ||
} | ||
|
||
.footnotes { | ||
margin-top: 1rem; | ||
} | ||
} | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: use docstrings for comments like go/pystyle#function-docs
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done