Code

merge demo changes into main#8

Code

Closed

alebjanes wants to merge 221 commits intomainDatawheel/template-chatbot:mainfrom demoDatawheel/oec-chatbot:demoCopy head branch name to clipboard

+826,349-147,656

Commits

Commits on Apr 9, 2024

• starting refactored wrapper

  pippo-sci

  committed
  edf458b

• update schema.json file to oec

  nspmx

  committed
  6d8c60c

Commits on Apr 10, 2024

• delete unused .json files

  nspmx

  committed
  804d933

• update Table class

  alebjanes

  committed
  6460b55

Commits on Apr 12, 2024

• update load_drilldowns to new schema.json

  alebjanes

  committed
  9eccc4c

• modify get_api to expose intermediate steps

  alebjanes

  committed
  39f3c41

Commits on Apr 16, 2024

• add oec token to config

  alebjanes

  committed
  055d90d

• add from_json method to ApiBuilder

  alebjanes

  committed
  6414f01

• add retries to get drilldown members

  alebjanes

  committed
  683c5ff

Commits on Apr 18, 2024

• fix similarity function name

  alebjanes

  committed
  24bbfaa

• add cube descriptions

  alebjanes

  committed
  bc06a7b

• update class notebooks with new methods

  alebjanes

  committed
  a7a1e5d

• fix missing arguments

  alebjanes

  committed
  3925a15

• change table method name in prompt

  alebjanes

  committed
  cf8609c

• modify cuts_processing to handle ranges of years

  alebjanes

  committed
  8c7ea7f

• small prompt change

  alebjanes

  committed
  2bef516

• modify Table class methods

  alebjanes

  committed
  fc14f64

• remove datausa references

  alebjanes

  committed
  bfbc90c

• update schema and database name

  alebjanes

  committed
  bbded45

• change api_build and add drilldown check

  alebjanes

  committed
  87667c5

• refactor code to take list of cubes to include

  alebjanes

  committed
  cf7a483

• add create logs table function

  alebjanes

  committed
  882453a

• udpate latest methods

  alebjanes

  committed
  9a53a3e

• add logs schema and table names as env vars

  alebjanes

  committed
  7bdac6d

• fix build_api call

  alebjanes

  committed
  d763bf9

• fix prompt function to get unique_names of drilldowns

  alebjanes

  committed
  3810001

• modify prompt for openai

  alebjanes

  committed
  5964bfd

• remove print prompt

  alebjanes

  committed
  c3837a5

• modify query

  alebjanes

  committed
  6f221fa

• Merge pull request #1 from Datawheel/api-builder

  Show description for 24fc5a2
  alebjanes

  authored
  24fc5a2

Commits on Apr 19, 2024

• add missing data in kwargs

  alebjanes

  committed
  5be98b9

• modify prompt to get api params

  alebjanes

  committed
  f32deba

• remove prints

  alebjanes

  committed
  a95f277

• fix prompt

  alebjanes

  committed
  81230b7

• modify methods to get unique names of levels

  alebjanes

  committed
  985aae4

• Merge pull request #2 from Datawheel/api-builder

  Show description for 655d857
  alebjanes

  authored
  655d857

• modify prompts

  alebjanes

  committed
  2390de7

Commits on Apr 20, 2024

• implement skeleton

  pippo-sci

  committed
  6d5b9be

• re-added to compile

  pippo-sci

  committed
  f35c33d

Commits on Apr 22, 2024

• first LLM test

  pippo-sci

  committed
  95f80be

• update cube description

  alebjanes

  committed
  ec2993c

• Merge remote-tracking branch 'origin/main' into api-builder

  alebjanes

  committed
  c02b671

Commits on Apr 23, 2024

• implement routing question

  pippo-sci

  committed
  5d0f221

• update schema.json file to oec

  

  nspmx

  authored and

  pippo-sci

  committed
  9779e6c

• delete unused .json files

  

  nspmx

  authored and

  pippo-sci

  committed
  8bc27ff

• update Table class

  

  alebjanes

  authored and

  pippo-sci

  committed
  be55c51

• update load_drilldowns to new schema.json

  

  alebjanes

  authored and

  pippo-sci

  committed
  0c48200

• modify get_api to expose intermediate steps

  

  alebjanes

  authored and

  pippo-sci

  committed
  21a21ff

• add oec token to config

  

  alebjanes

  authored and

  pippo-sci

  committed
  64d7acd

• add from_json method to ApiBuilder

  

  alebjanes

  authored and

  pippo-sci

  committed
  ba96b88

• add retries to get drilldown members

  

  alebjanes

  authored and

  pippo-sci

  committed
  a1cfc95

• fix similarity function name

  

  alebjanes

  authored and

  pippo-sci

  committed
  bc7b28c

• add cube descriptions

  

  alebjanes

  authored and

  pippo-sci

  committed
  a588f34

• update class notebooks with new methods

  

  alebjanes

  authored and

  pippo-sci

  committed
  08b069a

• fix missing arguments

  

  alebjanes

  authored and

  pippo-sci

  committed
  9d413a9

• change table method name in prompt

  

  alebjanes

  authored and

  pippo-sci

  committed
  ed57cd1

• modify cuts_processing to handle ranges of years

  

  alebjanes

  authored and

  pippo-sci

  committed
  9869e2d

• small prompt change

  

  alebjanes

  authored and

  pippo-sci

  committed
  fb7bba3

• modify Table class methods

  

  alebjanes

  authored and

  pippo-sci

  committed
  970acd6

• remove datausa references

  

  alebjanes

  authored and

  pippo-sci

  committed
  0ecd63c

• update schema and database name

  

  alebjanes

  authored and

  pippo-sci

  committed
  2d152ee

• change api_build and add drilldown check

  

  alebjanes

  authored and

  pippo-sci

  committed
  850bd70

• refactor code to take list of cubes to include

  

  alebjanes

  authored and

  pippo-sci

  committed
  1d8e1a4

• add create logs table function

  

  alebjanes

  authored and

  pippo-sci

  committed
  6c071e6

• udpate latest methods

  

  alebjanes

  authored and

  pippo-sci

  committed
  ced5b2c

• add logs schema and table names as env vars

  

  alebjanes

  authored and

  pippo-sci

  committed
  6a97ee4

• fix build_api call

  

  alebjanes

  authored and

  pippo-sci

  committed
  9786ce0

• fix prompt function to get unique_names of drilldowns

  

  alebjanes

  authored and

  pippo-sci

  committed
  aec6517

• modify prompt for openai

  

  alebjanes

  authored and

  pippo-sci

  committed
  acce0cd

• remove print prompt

  

  alebjanes

  authored and

  pippo-sci

  committed
  0931eef

• modify query

  

  alebjanes

  authored and

  pippo-sci

  committed
  996fba2

• add missing data in kwargs

  

  alebjanes

  authored and

  pippo-sci

  committed
  f642023

• modify prompt to get api params

  

  alebjanes

  authored and

  pippo-sci

  committed
  a3a6c11

• remove prints

  

  alebjanes

  authored and

  pippo-sci

  committed
  6151a2b

• fix prompt

  

  alebjanes

  authored and

  pippo-sci

  committed
  d2186b4

• modify methods to get unique names of levels

  

  alebjanes

  authored and

  pippo-sci

  committed
  fd3f79b

• re-added to compile

  pippo-sci

  committed
  3af57d9

• update langchain and openai versions

  alebjanes

  committed
  c8d40f3

• reorganize get_api

  alebjanes

  committed
  5ad8484

• update example of Table class

  alebjanes

  committed
  2e6d13d

• add function descriptions and token tracker

  alebjanes

  committed
  e10f9ec

• add descriptions

  alebjanes

  committed
  d3c2c26

• fix get_dimension_levels and add descriptions

  alebjanes

  committed
  5a54d2b

• adds descriptions

  alebjanes

  committed
  99d204a

• add token and cost into logs

  alebjanes

  committed
  99b8fa2

• uncomment commit

  alebjanes

  committed
  5e1f3ec

• implement answer routing and testing

  pippo-sci

  committed
  0ce0f46

Commits on Apr 24, 2024

• Merge pull request #3 from Datawheel/api-builder

  Show description for df83f87
  alebjanes

  authored
  df83f87

• modify prompts

  

  alebjanes

  authored and

  pippo-sci

  committed
  99f045f

• update cube description

  

  alebjanes

  authored and

  pippo-sci

  committed
  9901496

• update langchain and openai versions

  

  alebjanes

  authored and

  pippo-sci

  committed
  4b48ec3

• reorganize get_api

  

  alebjanes

  authored and

  pippo-sci

  committed
  d910faa

• update example of Table class

  

  alebjanes

  authored and

  pippo-sci

  committed
  f5b78dc

• add function descriptions and token tracker

  

  alebjanes

  authored and

  pippo-sci

  committed
  9afaf25

• add descriptions

  

  alebjanes

  authored and

  pippo-sci

  committed
  d634d61

• fix get_dimension_levels and add descriptions

  

  alebjanes

  authored and

  pippo-sci

  committed
  bdb11ab

• adds descriptions

  

  alebjanes

  authored and

  pippo-sci

  committed
  3e2da2b

• add token and cost into logs

  

  alebjanes

  authored and

  pippo-sci

  committed
  5aa01d0

• uncomment commit

  

  alebjanes

  authored and

  pippo-sci

  committed
  59edeb8

• update README to OEC project

  alebjanes

  committed
  742366f

• modify setup scripts

  alebjanes

  committed
  e43dba9

• small change

  alebjanes

  committed
  b37b8d3

• modify functions to get token_tracker as optional

  alebjanes

  committed
  8031101

• router answer json format outout

  pippo-sci

  committed
  5678e0d

Commits on Apr 25, 2024

• add github token to schema requests

  nspmx

  committed
  d7e3bf9

• change tesseract api call logic

  nspmx

  committed
  5bf56a9

• implement logic to return empty field in form_json

  pippo-sci

  committed
  3c44256

• add initial descriptions to schema.json

  nspmx

  committed
  09430f7

• cleaning

  pippo-sci

  committed
  2947bdb

• add descriptions json for the schema script

  nspmx

  committed
  ce3844b

Commits on Apr 26, 2024

• Merge pull request #4 from Datawheel/add-subnationals

  Show description for c196c8d
  alebjanes

  authored
  c196c8d

• Prep for frontend changes

  pippo-sci

  committed
  7f0a4c9

• add github token to schema requests

  

  nspmx

  authored and

  pippo-sci

  committed
  095add1

• change tesseract api call logic

  

  nspmx

  authored and

  pippo-sci

  committed
  66a199f

• add initial descriptions to schema.json

  

  nspmx

  authored and

  pippo-sci

  committed
  22d7906

• add descriptions json for the schema script

  

  nspmx

  authored and

  pippo-sci

  committed
  66a3a74

• Merge pull request #6 from Datawheel/wrapper

  Show description for 50c92f9
  pippo-sci

  authored
  50c92f9

• Merge remote-tracking branch 'origin/main' into api-builder

  alebjanes

  committed
  9d44b9f

• fronend wrapper communiations

  pippo-sci

  committed
  49e5af4

• hot fix missing import

  pippo-sci

  committed
  3101a13

Commits on Apr 27, 2024

• debugg frontend wrapper connection

  pippo-sci

  committed
  5c234ba

• fix loading in chat frontend

  pippo-sci

  committed
  110aa07

• hot fix - formats

  pippo-sci

  committed
  0a4223d

• rremoving some datausa legacy text

  pippo-sci

  committed
  a5cabfd

Commits on Apr 29, 2024

• update form_json shape

  pippo-sci

  committed
  d8be54d

• frontend style fix

  pippo-sci

  committed
  dd24406

• Merge pull request #13 from Datawheel/frontend

  Show description for 0c47612
  pippo-sci

  authored
  0c47612

• Merge remote-tracking branch 'origin/main' into api-builder

  alebjanes

  committed
  9ff8425

• update class methods examples

  alebjanes

  committed
  8bfeffd

• add get_api_params_from_wrapper step

  alebjanes

  committed
  6caf248

• modify ApiBuilder constructor

  alebjanes

  committed
  1d20c6a

• add get_form_json method

  alebjanes

  committed
  ef90b53

• Merge pull request #14 from Datawheel/api-builder

  Show description for 7e34792
  alebjanes

  authored
  7e34792

• json_iterator implemen OR logic if list in form_json

  pippo-sci

  committed
  cd5c420

Commits on Apr 30, 2024

• hot fix

  pippo-sci

  committed
  fac6d3c

• implements offer members

  pippo-sci

  committed
  d906cb9

• passing json as response

  pippo-sci

  committed
  4b50009

• Fixes #10

  pippo-sci

  committed
  2028a1d

• Merge pull request #15 from Datawheel/wrapper

  Show description for 2b1b722
  pippo-sci

  authored
  2b1b722

• modify get_api_params_from_wrapper step

  alebjanes

  committed
  03f2024

• fix Year handling and add 'All' option

  alebjanes

  committed
  151a884

• add default "en" locale to form_json

  alebjanes

  committed
  50db61d

• Merge pull request #16 from Datawheel/api-builder

  Show description for 4d16291
  alebjanes

  authored
  4d16291

• add product level to json_form if specified in query

  pippo-sci

  committed
  991c5a0

• Merge branch 'main' into wrapper

  pippo-sci

  committed
  97809c2

Commits on May 2, 2024

• update requirements.txt to fix dependencies

  nspmx

  committed
  ed7cc61

• fix filenames of config variables

  nspmx

  committed
  1ee6008

• comment tablecreation on logs.py

  nspmx

  committed
  6337a80

• debugging connection

  pippo-sci

  committed
  f8ef5ad

• Merge pull request #17 from Datawheel/wrapper

  Show description for 69e365c
  pippo-sci

  authored
  69e365c

• import tablespath on refwrapper on config

  nspmx

  committed
  9173e92

• add python log stream

  nspmx

  committed
  857a29f

• add ˆ.env to gitignore

  nspmx

  committed
  2c2d5f0

• Merge branch 'main' of https://github.com/Datawheel/oec-chatbot

  nspmx

  committed
  0bb1783

• add prints to debug

  nspmx

  committed
  80a24e0

• change TABLES_PATH import on json_check.py

  nspmx

  committed
  4a70cb2

• change api registry workflow

  nspmx

  committed
  d0cdb31

• update workflow files

  nspmx

  committed
  b04a08f

• change dns

  nspmx

  committed
  42e384f

• api-dev helm

  nspmx

  committed
  d06e190

• rollback retag

  nspmx

  committed
  b2976cd

Commits on May 3, 2024

• change dns

  nspmx

  committed
  5582fb0

• #update update host

  nspmx

  committed
  3ce1ccb

• #update disable probes

  nspmx

  committed
  6998527

• #update clean helm installation

  nspmx

  committed
  fe255ed

• #update update nginx conf

  nspmx

  committed
  ffc2310

• turn off logger

  alebjanes

  committed
  deee3c8

• fix nextjs workflow

  nspmx

  committed
  ff56bdf

• header test CORS issue

  pippo-sci

  committed
  3d18ecb

• Merge pull request #18 from Datawheel/frontend

  Show description for edec303
  pippo-sci

  authored
  edec303

• change get_form_json return type

  alebjanes

  committed
  5a37fd0

• add Year as default drilldown

  alebjanes

  committed
  c58510e

• add HS drilldown

  alebjanes

  committed
  67de2ec

• allow post on nginx api

  nspmx

  committed
  a6ec842

• #update add more methods to CORS allow

  nspmx

  committed
  bb46e9a

• #update change nginx ingress controller CORS

  nspmx

  committed
  bebf9b2

• add websockets to chatbot-site

  nspmx

  committed
  be0e733

• #update add more headers into allowed headers

  nspmx

  committed
  8d94cc1

• #update add more headers into allowed headers

  nspmx

  committed
  e9af9b7

• #update add 308 redirect

  nspmx

  committed
  9110165

• add X-Experimental-Stream-Data header on uvicorn

  nspmx

  committed
  1d96195

• add X-Experimental-Stream-Data header on uvicorn

  nspmx

  committed
  59f9100

• #update add upgrade connection on frontend

  nspmx

  committed
  ccef321

• allow cors on uvicorn

  nspmx

  committed
  bbe60cd

Commits on May 4, 2024

• #update CORS config for api

  nspmx

  committed
  3df8786

• #update adjust api resources

  nspmx

  committed
  a90cd21

• #update adjust nginx configuration

  nspmx

  committed
  a8f728c

• delete CORS from FastAPI

  nspmx

  committed
  c7e8561

• add ENVIRONMENT variable to add CORS on local environment

  nspmx

  committed
  5e88419

• #update change CORS config on api nginx

  nspmx

  committed
  7afaf75

• #update add OPTIONS directives on nginx

  nspmx

  committed
  7de930b

• #update add origin to headers

  nspmx

  committed
  a7d1171

• #update change CORS from location to server

  nspmx

  committed
  d0951b3

• #update change nginx config

  nspmx

  committed
  ec67178

• # update add proxy_pass_header to nginx

  nspmx

  committed
  3bdd7ac

• #update clean nginx

  nspmx

  committed
  1ab3a77

Commits on May 6, 2024

• gpt4

  pippo-sci

  committed
  8f486af

• remove data in return

  alebjanes

  committed
  c598bc0

• yield intermediate responses

  pippo-sci

  committed
  99c8abb

• Merge pull request #19 from Datawheel/demo

  Show description for 5665fe7
  pippo-sci

  authored
  5665fe7

Commits on May 7, 2024

• hot fix

  pippo-sci

  committed
  856b22c

• Merge pull request #20 from Datawheel/demo

  Show description for 7c012da
  pippo-sci

  authored
  7c012da

Commits on May 8, 2024

• add initial pyproject.toml ruff config file

  nspmx

  committed
  76bc791

• add pyproject.toml to main

  nspmx

  committed
  9331056

• add ruff docs to README

  nspmx

  committed
  e2bb049

Commits on May 10, 2024

• update connection and models

  alebjanes

  committed
  24eab9a

• add embedding models comparison notebook

  alebjanes

  committed
  a4320bf

• update embeddings notebook

  alebjanes

  committed
  17bb1ca

Commits on May 15, 2024

• add logs in to the app

  nspmx

  committed
  de72c4a

• Merge branch 'main' into psql-logging

  nspmx

  authored
  0e53eec

• Merge pull request #21 from Datawheel/psql-logging

  Show description for 3856092
  nspmx

  authored
  3856092

• add jwt to requirements.txt

  nspmx

  committed
  71b5b82

• alternative chain

  pippo-sci

  committed
  e0f7177

Commits on May 16, 2024

• Merge pull request #22 from Datawheel/wrapper-speed

  Show description for 4a5dfa3
  pippo-sci

  authored
  4a5dfa3

• hot fix

  pippo-sci

  committed
  eefecd2

• Merge pull request #23 from Datawheel/wrapper-speed

  Show description for 8857499
  pippo-sci

  authored
  8857499

• logs for wrapper and apicall

  nspmx

  committed
  50ae01e

Commits on Jul 19, 2024

• Striped test for eval

  pippo-sci

  committed
  491c6ea

• trigger deployment

  pippo-sci

  committed
  815e0cb

• modify prompts

  alebjanes

  committed
  76c7d86

• Merge remote-tracking branch 'origin/main' into demo

  alebjanes

  committed
  ea24060