Skip to content

Commit

Permalink
Merge pull request #571 from UKP-SQuARE/prompting
Browse files Browse the repository at this point in the history
Prompting
  • Loading branch information
HaritzPuerto authored Mar 28, 2024
2 parents 7fc3cb4 + 84d4bf6 commit a680eb1
Show file tree
Hide file tree
Showing 42 changed files with 32,675 additions and 12,959 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/build-and-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ jobs:
"skill-multiple-choice-metaqa",
"skill-kgqa-kqapro",
"evaluator",
"sensitivity",
]
include:
- build-args: ""
Expand Down Expand Up @@ -115,6 +116,8 @@ jobs:
build-args: "skill=kgqa-kqapro"
- service: evaluator
context: ./evaluator
- service: sensitivity
context: ./sensitivity
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/ci-model.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ jobs:

steps:
- uses: actions/checkout@v3

- name: Delete huge unnecessary tools folder
run: rm -rf /opt/hostedtoolcache

- name: Prepare
id: transformer-prep
run: |
Expand Down Expand Up @@ -94,4 +98,4 @@ jobs:
with:
report_paths: ${{ steps.transformer-extract.outputs.destination }}/test-reports/junit.xml
check_name: Transformers Test Report
fail_on_failure: true
fail_on_failure: true
18 changes: 9 additions & 9 deletions datastore-api/requirements.dev.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
pytest>=7.0.1
pytest-env>=0.6.2
requests-mock>=1.9.3
pytest-cov>=3.0.0
pytest-mock>=3.7.0
docker>=6.0.0
ipdb
httpx
setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability
pytest==8.0.2
pytest-env==1.1.3
requests-mock==1.11.0
pytest-cov==4.1.0
pytest-mock==3.12.0
docker==7.0.0
ipdb==0.13.13
httpx==0.27.0
setuptools==65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability
24 changes: 12 additions & 12 deletions datastore-api/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
Jinja2>=3.0.1
elasticsearch[async]>=7.16.1
fastapi>=0.73.0
filelock>=3.0.12
Jinja2==3.1.3
elasticsearch[async]==8.12.1
fastapi==0.110.0
filelock==3.13.1
pydantic==1.10.11
python-dotenv>=0.18.0
python-multipart>=0.0.5
requests>=2.25.1
numpy>=1.21.5
uvicorn[standard]>=0.14.0
python-dotenv==1.0.1
python-multipart==0.0.9
requests==2.31.0
numpy==1.26.4
uvicorn[standard]==0.27.1
square-auth==0.0.14
pymongo==4.0.2
scipy>=1.7.3
scipy==1.12.0
pyjwt==2.4.0
aiohttp>=3.8.1
tqdm
aiohttp==3.9.3
tqdm==4.66.2
square-elk-json-formatter==0.0.3
trafilatura==1.4.0
19 changes: 18 additions & 1 deletion docker-compose.ytt.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ services:
retries: 10

keycloak:
image: jboss/keycloak:16.1.1
image: sihebi/keycloak:16.1.1
environment:
DB_VENDOR: postgres
DB_ADDR: db
Expand Down Expand Up @@ -442,6 +442,22 @@ services:
- "traefik.http.middlewares.model-dpr-stripprefix.stripprefix.prefixes=/api/main"
- "traefik.http.middlewares.model-dpr-addprefix.addPrefix.prefix=/api"

sensitivity:
image: #@ "ukpsquare/sensitivity:" + data.values.tag
build:
context: ./sensitivity
volumes:
- hf_models:/root/.cache/huggingface
labels:
- "traefik.enable=true"
- "traefik.http.routers.sensitivity.rule=PathPrefix(`/api/sensitivity`)"
- "traefik.http.routers.sensitivity.entrypoints=websecure"
- "traefik.http.routers.sensitivity.tls=true"
- "traefik.http.routers.sensitivity.tls.certresolver=le"
- "traefik.http.routers.sensitivity.middlewares=sensitivity-stripprefix,sensitivity-addprefix"
- "traefik.http.middlewares.sensitivity-stripprefix.stripPrefixRegex.regex=/api/[a-zA-Z0-9_-]+"
- "traefik.http.middlewares.sensitivity-addprefix.addPrefix.prefix=/api"

dpr_worker:
image: #@ "ukpsquare/model-inference-transformer:" + data.values.tag
build:
Expand Down Expand Up @@ -738,5 +754,6 @@ volumes:
driver: local
virtuoso-db:
driver: local
hf_models:
portainer-data:
driver: local
102 changes: 51 additions & 51 deletions docs/docusaurus.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ const config = {
sidebarPath: require.resolve('./sidebars.js'),
// Please change this to your repo.
editUrl: 'https://github.com/UKP-SQuARE/square-core/tree/master/docs',
path: 'home',
routeBasePath: 'home',
path: 'home',
routeBasePath: 'home',
},
blog: {
showReadingTime: true,
Expand All @@ -38,42 +38,42 @@ const config = {
},
}),
],
[
"redocusaurus",
{
specs: [
{
route: "/api/datastores/",
spec: "https://square.ukp-lab.de/api/datastores/openapi.json",
},
{
[
"redocusaurus",
{
specs: [
{
route: "/api/datastores/",
spec: "https://square.ukp-lab.de/api/datastores/openapi.json",
},
{
route: "/api/skills/",
spec: "https://square.ukp-lab.de/api/skill-manager/openapi.json",
spec: "https://square.ukp-lab.de/api/skill-manager/openapi.json",
},
{
{
route: "/api/models-inference/",
spec: "https://square.ukp-lab.de/api/main/openapi.json",
spec: "https://square.ukp-lab.de/api/main/openapi.json",
},
{
{
route: "/api/models-management/",
spec: "https://square.ukp-lab.de/api/models/openapi.json",
spec: "https://square.ukp-lab.de/api/models/openapi.json",
},
],
},
],
],
},
],
],

themeConfig:
/** @type {import('@docusaurus/preset-classic').ThemeConfig} */
({
announcementBar: {
id: 'beta',
content:
'The <b>model management</b> service is currently in beta. The stable version will be released soon.',
backgroundColor: '#fafbfc',
textColor: '#091E42',
isCloseable: true,
},
id: 'beta',
content:
'The <b>model management</b> service is currently in beta. The stable version will be released soon.',
backgroundColor: '#fafbfc',
textColor: '#091E42',
isCloseable: true,
},
navbar: {
title: 'UKP-SQuARE',
logo: {
Expand All @@ -87,35 +87,35 @@ const config = {
position: 'left',
label: 'Overview',
},
{
{
type: 'doc',
docId: 'components/datastores',
position: 'left',
label: 'Components',
},
{
label: 'API',
position: 'left',
items: [
{
label: 'Datastores',
to: '/api/datastores/',
},
{
label: 'Models-Inference',
to: '/api/models-inference/',
},
{
label: 'Models-Management',
to: '/api/models-management/',
},
{
label: 'Skills',
to: '/api/skills/',
},
],
},
{
{
label: 'API',
position: 'left',
items: [
{
label: 'Datastores',
to: '/api/datastores/',
},
{
label: 'Models-Inference',
to: '/api/models-inference/',
},
{
label: 'Models-Management',
to: '/api/models-management/',
},
{
label: 'Skills',
to: '/api/skills/',
},
],
},
{
type: 'doc',
docId: 'versioning/changelog',
position: 'left',
Expand Down Expand Up @@ -148,7 +148,7 @@ const config = {
label: 'Twitter',
href: 'https://twitter.com/UKPLab',
},
{
{
label: 'Linkedin',
href: 'https://www.linkedin.com/company/tu-darmstadt/',
},
Expand Down
Loading

0 comments on commit a680eb1

Please sign in to comment.