Skip to content

Commit

Permalink
Merge branch 'refactor/argilla-server/better-oauth2-integration' into…
Browse files Browse the repository at this point in the history
… feature/better-oauth2-integration-keycloak
  • Loading branch information
paulbauriegel authored Jan 22, 2025
2 parents 58bb93a + 0e69ce0 commit bc1084a
Show file tree
Hide file tree
Showing 146 changed files with 34,723 additions and 1,458 deletions.
1 change: 0 additions & 1 deletion .github/workflows/argilla-frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ jobs:
- name: Build package 📦
env:
# BASE_URL is used in the server to support parameterizable base root path
# See scripts/build_frontend.sh
BASE_URL: "@@baseUrl@@"
DIST_FOLDER: ./dist
run: |
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/argilla-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ jobs:
run: pdm install

- name: Run tests 📈
env:
HF_TOKEN_ARGILLA_INTERNAL_TESTING: ${{ secrets.HF_TOKEN_ARGILLA_INTERNAL_TESTING }}
run: |
ARGILLA_DATABASE_URL=postgresql://postgres:postgres@localhost:5432/argilla
ARGILLA_ELASTICSEARCH=http://localhost:9200
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/argilla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
USERNAME: argilla
PASSWORD: 12345678
API_KEY: argilla.apikey
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
defaults:
run:
working-directory: argilla
Expand Down
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,6 @@ sw.*
# Ruff cache
.ruff_cache/

yarn.lock
package-lock.json

# App generated files
src/**/server/static/

Expand Down
12 changes: 12 additions & 0 deletions argilla-frontend/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,18 @@ These are the section headers that we use:

## [Unreleased]()

## [2.6.0](https://github.com/argilla-io/argilla/compare/v2.5.0...v2.6.0)

### Added

- Add share progress feature ([#5727](https://github.com/argilla-io/argilla/pull/5727))
- Added feature to export datasets from Argilla to Hugging Face hub from the UI ([#5730](https://github.com/argilla-io/argilla/pull/5730))

### Fixed

- Improved performance and accessibility ([#5724](https://github.com/argilla-io/argilla/pull/5724))
- Fixed dataset update date information in the dataset list ([#5741](https://github.com/argilla-io/argilla/pull/#5741))

## [2.5.0](https://github.com/argilla-io/argilla/compare/v2.4.1...v2.5.0)

### Added
Expand Down
7 changes: 7 additions & 0 deletions argilla-frontend/assets/css/fonts.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
@font-face {
font-family: "raptor_v2_premiumbold";
src: url("/fonts/raptorv2premium-bold-webfont.woff2") format("woff2"),
url("/fonts/raptorv2premium-bold-webfont.woff") format("woff");
font-weight: normal;
font-style: normal;
}
File renamed without changes.
27 changes: 27 additions & 0 deletions argilla-frontend/assets/icons/export.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/*
* coding=utf-8
* Copyright 2021-present, the Recognai S.L. team.
*
* 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.
*/

/* eslint-disable */
var icon = require('vue-svgicon')
icon.register({
'export': {
width: 26,
height: 31,
viewBox: '0 0 26 31',
data: '<path pid="0" d="M19.852 7.734L17.92 9.666l-3.463-3.463V22.86h-2.732V6.203L8.262 9.666 6.33 7.734l6.761-6.76 6.76 6.76z" _fill="#000" fill-opacity=".87"/><path pid="1" d="M3.53 28.242V14.583h5.463v-2.732H.798v19.123h24.586V11.85h-8.195v2.732h5.463v13.659H3.53z" _fill="#000" fill-opacity=".87"/>'
}
})
1 change: 1 addition & 0 deletions argilla-frontend/assets/icons/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ require('./discard')
require('./draggable')
require('./expand-arrows')
require('./exploration')
require('./export')
require('./external-link')
require('./external')
require('./filter')
Expand Down
2 changes: 0 additions & 2 deletions argilla-frontend/assets/scss/abstract.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@
*/

// abstract
@import "abstract/fonts/fonts";
@import "abstract/functions/functions";
@import "abstract/variables/variables";
@import "abstract/variables/themes";
@import "abstract/mixins/mixins";
@import "abstract/mixins/media-queries";
@import "abstract/mixins/grid-mixins";
Expand Down
7 changes: 0 additions & 7 deletions argilla-frontend/assets/scss/abstract/fonts/fonts.scss

This file was deleted.

Loading

0 comments on commit bc1084a

Please sign in to comment.