Skip to content

Commit bfa21bc

Browse files
erikspearserikspears
committed
release 3.9.0 to prerelease branch including pip freeze version of requirements.txt
2 parents 6a9b686 + 4a25a0e commit bfa21bc

23 files changed

+367
-147
lines changed

‎.github/workflows/docker-image.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
- name: Login to Docker Hub
1515
uses: docker/login-action@v3
1616
with:
17-
username: ${{ secrets.DOCKER_USERNAME }}
18-
password: ${{ secrets.DOCKER_PASSWORD }}
17+
username: ${{ secrets.SBS_DOCKER_USER }}
18+
password: ${{ secrets.SBS_DOCKER_PAT }}
1919
- name: Build and Push Swirl Docker Image
2020
run: |
2121
BRANCH_NAME=${GITHUB_REF#refs/heads/}
@@ -25,8 +25,8 @@ jobs:
2525
- name: Update the Docker Repo Description
2626
uses: peter-evans/dockerhub-description@v4
2727
with:
28-
username: ${{ secrets.DOCKER_USERNAME_X }}
29-
password: ${{ secrets.DOCKER_PASSWORD_X }}
28+
username: ${{ secrets.SBS_DOCKER_USER }}
29+
password: ${{ secrets.SBS_DOCKER_PAT }}
3030
repository: swirlai/swirl-search
3131
- name: Upload Log Files
3232
if: always()

‎.github/workflows/qa-suite.yml

+16-3
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ jobs:
2323
- name: Login to Docker Hub
2424
uses: docker/login-action@v3
2525
with:
26-
username: ${{ secrets.DOCKER_USERNAME }}
27-
password: ${{ secrets.DOCKER_PASSWORD }}
26+
username: ${{ secrets.SBS_DOCKER_USER }}
27+
password: ${{ secrets.SBS_DOCKER_PAT }}
2828
- name: Set Up Python
2929
uses: actions/setup-python@v5
3030
with:
31-
python-version: '3.12.5'
31+
python-version: '3.12.6'
3232
cache: 'pip'
3333
- name: Install Swirl
3434
run: ./install.sh
@@ -46,13 +46,26 @@ jobs:
4646
python swirl.py start
4747
env:
4848
ALLOWED_HOSTS: localhost,host.docker.internal
49+
- name: Decode BigQuery token and create JSON file
50+
run: |
51+
echo "$BIGQUERY_TOKEN_BASE64" | base64 --decode > "${{ github.workspace }}/token.json"
52+
env:
53+
BIGQUERY_TOKEN_BASE64: ${{ secrets.QA_BIGQUERY_TOKEN_BASE64 }}
4954
- name: Run the QA Suite
5055
run: |
5156
echo "SWIRL_TEST_HOST=localhost" > .env.qa
5257
echo "MSAL_HOST=localhost" >> .env.qa
5358
echo "MSAL_CB_PORT=8000" >> .env.qa
5459
echo "QA_ADMIN_PW=${{ secrets.QA_ADMIN_PW }}" >> .env.qa
5560
echo "QA_OPENAI_KEY=${{ secrets.QA_OPENAI_KEY }}" >> .env.qa
61+
echo "QA_NLR_USERNAME=${{ secrets.QA_NLR_USERNAME }}" >> .env.qa
62+
echo "QA_NLR_PASSWORD=${{ secrets.QA_NLR_PASSWORD }}" >> .env.qa
63+
echo "QA_CRUNCHBASE_KEY=${{ secrets.QA_CRUNCHBASE_KEY }}" >> .env.qa
64+
echo "QA_BLOCKCHAIN_KEY=${{ secrets.QA_BLOCKCHAIN_KEY }}" >> .env.qa
65+
echo "QA_YOUTRACK_TOKEN=${{ secrets.QA_YOUTRACK_TOKEN }}" >> .env.qa
66+
echo "QA_GITHUB_TOKEN=${{ secrets.QA_GITHUB_TOKEN }}" >> .env.qa
67+
echo "BIGQUERY_TOKEN_PATH=${{ github.workspace }}/token.json" >> .env.qa
68+
echo "QA_TRELLO_KEYS=${{ secrets.QA_TRELLO_KEYS }}" >> .env.qa
5669
echo "========"
5770
cat .env.qa
5871
echo "========"

‎.github/workflows/spell-checker.yml

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,8 @@ name: Check Spelling
22

33
# Trigger to only run this workflow automatically on docs/ directory changes
44
on:
5-
push:
6-
branches:
7-
- "main"
8-
paths:
9-
- "docs/**"
10-
115
pull_request:
12-
# Run for all PRs to develop - means PR cannot merge until unit tests pass
6+
# Run for all PRs to develop or main - means PR cannot merge until unit tests pass
137
branches:
148
- develop
159
- main

‎.github/workflows/test-build-pipeline.yml

+21-8
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Set Up Python
2121
uses: actions/setup-python@v5
2222
with:
23-
python-version: '3.12.5'
23+
python-version: '3.12.6'
2424
cache: 'pip'
2525
- name: Install Swirl
2626
run: ./install.sh
@@ -48,12 +48,12 @@ jobs:
4848
- name: Login to Docker Hub
4949
uses: docker/login-action@v3
5050
with:
51-
username: ${{ secrets.DOCKER_USERNAME }}
52-
password: ${{ secrets.DOCKER_PASSWORD }}
51+
username: ${{ secrets.SBS_DOCKER_USER }}
52+
password: ${{ secrets.SBS_DOCKER_PAT }}
5353
- name: Set Up Python
5454
uses: actions/setup-python@v5
5555
with:
56-
python-version: '3.12.5'
56+
python-version: '3.12.6'
5757
cache: 'pip'
5858
- name: Install Swirl
5959
run: ./install.sh
@@ -71,13 +71,26 @@ jobs:
7171
python swirl.py start
7272
env:
7373
ALLOWED_HOSTS: localhost,host.docker.internal
74+
- name: Decode BigQuery token and create JSON file
75+
run: |
76+
echo "$BIGQUERY_TOKEN_BASE64" | base64 --decode > "${{ github.workspace }}/token.json"
77+
env:
78+
BIGQUERY_TOKEN_BASE64: ${{ secrets.QA_BIGQUERY_TOKEN_BASE64 }}
7479
- name: Run the QA Suite
7580
run: |
7681
echo "SWIRL_TEST_HOST=localhost" > .env.qa
7782
echo "MSAL_HOST=localhost" >> .env.qa
7883
echo "MSAL_CB_PORT=8000" >> .env.qa
7984
echo "QA_ADMIN_PW=${{ secrets.QA_ADMIN_PW }}" >> .env.qa
8085
echo "QA_OPENAI_KEY=${{ secrets.QA_OPENAI_KEY }}" >> .env.qa
86+
echo "QA_NLR_USERNAME=${{ secrets.QA_NLR_USERNAME }}" >> .env.qa
87+
echo "QA_NLR_PASSWORD=${{ secrets.QA_NLR_PASSWORD }}" >> .env.qa
88+
echo "QA_CRUNCHBASE_KEY=${{ secrets.QA_CRUNCHBASE_KEY }}" >> .env.qa
89+
echo "QA_BLOCKCHAIN_KEY=${{ secrets.QA_BLOCKCHAIN_KEY }}" >> .env.qa
90+
echo "QA_YOUTRACK_TOKEN=${{ secrets.QA_YOUTRACK_TOKEN }}" >> .env.qa
91+
echo "QA_GITHUB_TOKEN=${{ secrets.QA_GITHUB_TOKEN }}" >> .env.qa
92+
echo "BIGQUERY_TOKEN_PATH=${{ github.workspace }}/token.json" >> .env.qa
93+
echo "QA_TRELLO_KEYS=${{ secrets.QA_TRELLO_KEYS }}" >> .env.qa
8194
echo "========"
8295
cat .env.qa
8396
echo "========"
@@ -92,8 +105,8 @@ jobs:
92105
- name: Login to Docker Hub
93106
uses: docker/login-action@v3
94107
with:
95-
username: ${{ secrets.DOCKER_USERNAME }}
96-
password: ${{ secrets.DOCKER_PASSWORD }}
108+
username: ${{ secrets.SBS_DOCKER_USER }}
109+
password: ${{ secrets.SBS_DOCKER_PAT }}
97110
- name: Build and Push Swirl Docker Image
98111
run: |
99112
BRANCH_NAME=${GITHUB_REF#refs/heads/}
@@ -103,8 +116,8 @@ jobs:
103116
- name: Update the Docker Repo Description
104117
uses: peter-evans/dockerhub-description@v4
105118
with:
106-
username: ${{ secrets.DOCKER_USERNAME_X }}
107-
password: ${{ secrets.DOCKER_PASSWORD_X }}
119+
username: ${{ secrets.SBS_DOCKER_USER }}
120+
password: ${{ secrets.SBS_DOCKER_PAT }}
108121
repository: swirlai/swirl-search
109122
- name: Upload Log Files
110123
if: always()

‎.github/workflows/testing-wip.yml

+16-3
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ jobs:
3636
- name: Login to Docker Hub
3737
uses: docker/login-action@v3
3838
with:
39-
username: ${{ secrets.DOCKER_USERNAME }}
40-
password: ${{ secrets.DOCKER_PASSWORD }}
39+
username: ${{ secrets.SBS_DOCKER_USER }}
40+
password: ${{ secrets.SBS_DOCKER_PAT }}
4141
- name: Set Up Python
4242
uses: actions/setup-python@v5
4343
with:
44-
python-version: '3.12.5'
44+
python-version: '3.12.6'
4545
cache: 'pip'
4646
- name: Install Swirl
4747
run: ./install.sh
@@ -59,13 +59,26 @@ jobs:
5959
python swirl.py start
6060
env:
6161
ALLOWED_HOSTS: localhost,host.docker.internal
62+
- name: Decode BigQuery token and create JSON file
63+
run: |
64+
echo "$BIGQUERY_TOKEN_BASE64" | base64 --decode > "${{ github.workspace }}/token.json"
65+
env:
66+
BIGQUERY_TOKEN_BASE64: ${{ secrets.QA_BIGQUERY_TOKEN_BASE64 }}
6267
- name: Run the QA Suite
6368
run: |
6469
echo "SWIRL_TEST_HOST=localhost" > .env.qa
6570
echo "MSAL_HOST=localhost" >> .env.qa
6671
echo "MSAL_CB_PORT=8000" >> .env.qa
6772
echo "QA_ADMIN_PW=${{ secrets.QA_ADMIN_PW }}" >> .env.qa
6873
echo "QA_OPENAI_KEY=${{ secrets.QA_OPENAI_KEY }}" >> .env.qa
74+
echo "QA_NLR_USERNAME=${{ secrets.QA_NLR_USERNAME }}" >> .env.qa
75+
echo "QA_NLR_PASSWORD=${{ secrets.QA_NLR_PASSWORD }}" >> .env.qa
76+
echo "QA_CRUNCHBASE_KEY=${{ secrets.QA_CRUNCHBASE_KEY }}" >> .env.qa
77+
echo "QA_BLOCKCHAIN_KEY=${{ secrets.QA_BLOCKCHAIN_KEY }}" >> .env.qa
78+
echo "QA_YOUTRACK_TOKEN=${{ secrets.QA_YOUTRACK_TOKEN }}" >> .env.qa
79+
echo "QA_GITHUB_TOKEN=${{ secrets.QA_GITHUB_TOKEN }}" >> .env.qa
80+
echo "BIGQUERY_TOKEN_PATH=${{ github.workspace }}/token.json" >> .env.qa
81+
echo "QA_TRELLO_KEYS=${{ secrets.QA_TRELLO_KEYS }}" >> .env.qa
6982
echo "========"
7083
cat .env.qa
7184
echo "========"

‎.github/workflows/unit-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Set Up Python
3232
uses: actions/setup-python@v5
3333
with:
34-
python-version: '3.12.5'
34+
python-version: '3.12.6'
3535
cache: 'pip'
3636
- name: Install Swirl
3737
run: ./install.sh

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ dmypy.json
130130

131131
/static
132132

133-
swirl/migrations/
134133

135134
# emacs
136135
*~

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.12.5-slim-bookworm
1+
FROM python:3.12.6-slim-bookworm
22

33
# Update, upgrade and install packages in a single RUN to reduce layers
44
RUN apt-get update && apt-get install -y \

‎SearchProviders/atlassian.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"tags": [
2323
"Jira",
2424
"Atlassian",
25-
"Internal"
25+
"Dev"
2626
]
2727
},
2828
{
@@ -48,7 +48,7 @@
4848
"tags": [
4949
"Confluence",
5050
"Atlassian",
51-
"Internal"
51+
"Dev"
5252
]
5353
},
5454
{

‎SearchProviders/company_data_bigquery.json

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"name": "Company Data - BigQuery",
3+
"active": false,
4+
"default": false,
5+
"connector": "BigQuery",
6+
"url": "",
7+
"query_template": "select {fields} from `{table}` where search({field1}, '{query_string}') or search({field2}, '{query_string}') or search({field3}, '{query_string}');",
8+
"query_template_json": {},
9+
"post_query_template": {},
10+
"http_request_headers": {},
11+
"page_fetch_config_json": {},
12+
"query_processors": [
13+
"AdaptiveQueryProcessor"
14+
],
15+
"query_mappings": "fields=*,sort_by_date=year_founded,table=company_dataset.company,field1=name,field2=domain,field3=locality",
16+
"result_grouping_field": "",
17+
"result_processors": [
18+
"MappingResultProcessor",
19+
"CosineRelevancyResultProcessor"
20+
],
21+
"response_mappings": "",
22+
"result_mappings": "title=name,body='{name} was founded in {year_founded} and serves the {industry} industry. The company is located in {locality} and has approximately {current_employee_estimate} employees. The registered domain for this organization is: {domain}',url='https://www.{linkedin_url}',NO_PAYLOAD",
23+
"results_per_query": 10,
24+
"credentials": "/path/to/bigquery/token.json",
25+
"eval_credentials": "",
26+
"tags": [
27+
"Company",
28+
"BigQuery",
29+
"Internal"
30+
]
31+
}

‎SearchProviders/funding_db_bigquery.json

-22
This file was deleted.

‎SearchProviders/github.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"GitHub",
2929
"Code",
3030
"Internal",
31-
"Development"
31+
"Dev"
3232
]
3333
},
3434
{
@@ -60,7 +60,7 @@
6060
"GitHub",
6161
"Issues",
6262
"Internal",
63-
"Development"
63+
"Dev"
6464
]
6565
},
6666
{
@@ -92,7 +92,7 @@
9292
"GitHub",
9393
"PullRequests",
9494
"Internal",
95-
"Development"
95+
"Dev"
9696
]
9797
},
9898
{
@@ -124,7 +124,7 @@
124124
"GitHub",
125125
"Commits",
126126
"Internal",
127-
"Development"
127+
"Dev"
128128
]
129129
}
130130
]

‎SearchProviders/google.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,8 @@
152152
"credentials": "key=AIzaSyDvVeE-L6nCC9u-TTGuhggvSmzhtiTHJsA",
153153
"eval_credentials": "",
154154
"tags": [
155-
"Swirl"
155+
"Swirl",
156+
"Dev"
156157
]
157158
}
158159
]

‎SearchProviders/hacker_news.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"tags": [
2727
"HackerNews",
2828
"Stories",
29-
"Development"
29+
"Dev"
3030
]
3131
},
3232
{
@@ -56,7 +56,7 @@
5656
"tags": [
5757
"HackerNews",
5858
"Comments",
59-
"Development"
59+
"Dev"
6060
]
6161
}
6262

‎SearchProviders/microsoft.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"query_mappings": "NOT=true,NOT_CHAR=-",
1414
"result_grouping_field": "conversationId",
1515
"result_processors": [
16-
"MappingResultProcessor",
1716
"DedupeByFieldResultProcessor",
17+
"MappingResultProcessor",
1818
"CosineRelevancyResultProcessor"
1919
],
2020
"response_mappings": "",
@@ -75,7 +75,7 @@
7575
"CosineRelevancyResultProcessor"
7676
],
7777
"response_mappings": "",
78-
"result_mappings": "title=resource.name,body='{resource.name} - {summary}',date_published=resource.createdDateTime,url=resource.webUrl,author=resource.createdBy.user.displayName,resource.lastModifiedBy.user.displayName,resource.lastModifiedDateTime,FILE_SYSTEM,NO_PAYLOAD",
78+
"result_mappings": "title=resource.name,body='{resource.name} - {summary}',date_published=resource.createdDateTime,url=resource.webUrl,author=resource.createdBy.user.displayName,resource.lastModifiedBy.user.displayName,resource.lastModifiedDateTime,NO_PAYLOAD",
7979
"results_per_query": 10,
8080
"credentials": "",
8181
"eval_credentials": "",

0 commit comments

Comments
 (0)