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

Colinmegill/topics experimental #1884

Merged
merged 54 commits into from
Jan 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
96bbb94
implementing extremity
colinmegill Dec 23, 2024
d38dbfa
update object
tevko Dec 23, 2024
4a15dc0
remove comments
tevko Dec 23, 2024
fe89e77
add ability to filter report sections and choose model
tevko Dec 24, 2024
01e202a
improve groups analysis subtask prompt
colinmegill Dec 25, 2024
aa318a4
improve groups xml prompt
colinmegill Dec 26, 2024
337e910
revert, debug logging for extremity tid access
colinmegill Dec 26, 2024
8b1daba
probable fix for math tid extremity lookup
colinmegill Dec 28, 2024
48d3024
removing logging
colinmegill Dec 28, 2024
e069893
null check for query params in case of no section given
colinmegill Dec 28, 2024
abf3fe7
order uncertinaty last
colinmegill Dec 28, 2024
c16e94c
prettier formatting
colinmegill Dec 28, 2024
bfb65fd
up sonnet token limit to 3000 to test streaming
colinmegill Dec 28, 2024
98f584e
switch to gemini flash, up tokens to 3000
colinmegill Dec 28, 2024
d6a148f
add try catch blocks for narrative rendering errors
colinmegill Dec 28, 2024
6dd1954
update prompts to avoid percentages in text
colinmegill Dec 29, 2024
222c27f
remove "striking"
colinmegill Dec 29, 2024
6ad67c4
placeholder topics xml
colinmegill Dec 29, 2024
a3723b3
rendering topics in polis, v0.1
colinmegill Dec 30, 2024
70e9d63
fix token limit, v0.2
colinmegill Dec 30, 2024
117b194
nicer name v0.3
colinmegill Dec 30, 2024
4c8f9de
clean up folder structure
colinmegill Dec 30, 2024
0a156ac
minor prompt tweaks v0.4
colinmegill Dec 30, 2024
7c49a8e
upgrade to gemini-1206 :D
colinmegill Jan 1, 2025
a43df89
remove unused adapters for now
colinmegill Jan 1, 2025
63acd84
increase gemini tokencount
colinmegill Jan 1, 2025
d8d6d89
improve topic prompt v0.6
colinmegill Jan 1, 2025
c9c8e6d
make dynamic topics work
tevko Jan 7, 2025
9a8d352
use gh package
tevko Jan 8, 2025
a1038ca
Merge branch 'edge' into colinmegill/topics-experimental
colinmegill Jan 15, 2025
2ac00ad
Merge branch 'edge' into colinmegill/topics-experimental
colinmegill Jan 15, 2025
ff02bd2
Merge branch 'edge' into colinmegill/topics-experimental
colinmegill Jan 16, 2025
be32830
Merge remote-tracking branch 'origin/te-server-refactor-1' into colin…
colinmegill Jan 16, 2025
f96d070
Merge branch 'edge' into colinmegill/topics-experimental
colinmegill Jan 16, 2025
f9388ed
docker fixes
tevko Jan 17, 2025
cdb9f57
docker compose fixes
tevko Jan 17, 2025
37739dd
relax csv comment count
tevko Jan 17, 2025
4569a45
add draft eval objectives to readme
colinmegill Jan 18, 2025
d520572
increase proxy time to 300 ngnix
colinmegill Jan 19, 2025
d9903f5
better ux if missing data
tevko Jan 20, 2025
ccedd5a
add back npmrc and update package
tevko Jan 20, 2025
c1afc69
add warning
tevko Jan 20, 2025
8bbbd48
add caching
tevko Jan 22, 2025
63813cd
store topics as well
tevko Jan 22, 2025
c565d83
enable cache invalidation and deletion of stale items
tevko Jan 23, 2025
a7e08cd
remove gh packages reference
tevko Jan 24, 2025
3e8f4e7
fix action and remove sample code
tevko Jan 27, 2025
9e2ca33
adjust formatting
tevko Jan 27, 2025
c05e834
rename jigsaw
tevko Jan 27, 2025
d8b10b7
use secrets env vars
tevko Jan 27, 2025
01a3295
update env
tevko Jan 27, 2025
c65ea05
tests
tevko Jan 27, 2025
29b7563
move env around for test
tevko Jan 27, 2025
c422fd1
add config region
tevko Jan 27, 2025
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
8 changes: 8 additions & 0 deletions .github/workflows/cypress-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,18 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: set up google creds
env:
DATA: ${{ secrets.JIGSAW_SERVICE_ACCT }}
run: |
echo $DATA > server/llm-service-account.json

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Build and start Docker containers
env:
JIGSAW_SERVICE_ACCT: ${{ secrets.JIGSAW_SERVICE_ACCT }}
run: |
docker compose -f docker-compose.yml -f docker-compose.test.yml --env-file test.env --profile postgres up -d --build

Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/deploy-preprod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@ jobs:
- name: Create empty .env file
run: touch .env

- name: set up google creds
env:
DATA: ${{ secrets.JIGSAW_SERVICE_ACCT }}
run: |
echo $DATA > server/llm-service-account.json

- name: Build static assets
env:
EMBED_SERVICE_HOSTNAME: preprod.pol.is
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ prod.env
xids.csv
preprod.env
.venv
server/jigsaw-vertex-integration-92ef30330cf7.json
server/llm-service-account.json
Loading
Loading