Skip to content

Commit

Permalink
[RELEASE] 2.0.0rc1 (#5074)
Browse files Browse the repository at this point in the history
  • Loading branch information
frascuchon authored Jun 21, 2024
2 parents 5222d50 + b4fe7d8 commit 744ce5c
Show file tree
Hide file tree
Showing 1,699 changed files with 89,050 additions and 110,307 deletions.
11 changes: 4 additions & 7 deletions .github/ISSUE_TEMPLATE/🆕-feature-request.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,16 @@ about: Cool new ideas for the project
title: "[FEATURE]"
labels: ''
assignees: ''

---

<!-- Ask David for help you to contribute https://calendly.com/argilla-office-hours/30min or feel free to submit a pull request straight away: https://github.com/argilla-io/argilla/pulls If you'd like to discuss your feature request or specific needs with our product team, contact Natalia Elvira in our slack community or book a slot with her: https://calendly.com/natalia-elvira/30min -->

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->

**Describe the solution you'd like**
A clear and concise description of what you want to happen.
<!-- A clear and concise description of what you want to happen. -->

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
<!-- A clear and concise description of any alternative solutions or features you've considered. -->

**Additional context**
Add any other context or screenshots about the feature request here.
<!-- Add any other context or screenshots about the feature request here. -->
15 changes: 7 additions & 8 deletions .github/ISSUE_TEMPLATE/🐞-bug-ui-ux.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,33 @@ about: UI or UX bugs and unexpected behavior
title: "[BUG-UI/UX]"
labels: ''
assignees: ''

---

<!-- Ask David for help you to contribute https://calendly.com/argilla-office-hours/30min or feel free to submit a pull request straight away: https://github.com/argilla-io/argilla/pulls or -->

**Describe the bug**
A clear and concise description of what the bug is.
<!-- A clear and concise description of what the bug is. -->

**To Reproduce**
<!--
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
-->

**Expected behavior**
A clear and concise description of what you expected to happen.
<!-- A clear and concise description of what you expected to happen. -->

**Screenshots**
If applicable, add screenshots to help explain your problem.
<!-- If applicable, add screenshots to help explain your problem. -->

<!-- Since version 1.16.0 you can use `python -m argilla info` command to easily get the used versions -->
**Environment (please complete the following information):**
<!-- Since version 1.16.0 you can use `python -m argilla info` command to easily get the used versions -->
- OS [e.g. iOS]:
- Browser [e.g. chrome, safari]:
- Argilla Version [e.g. 1.0.0]:
- ElasticSearch Version [e.g. 7.10.2]:
- Docker Image (optional) [e.g. argilla:v1.0.0]:

**Additional context**
Add any other context about the problem here.
<!-- Add any other context about the problem here. -->
3 changes: 0 additions & 3 deletions .github/ISSUE_TEMPLATE/📚-add-a-documentation-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ about: Have you spotted a typo or mistake in our docs?
title: "[DOCS]"
labels: ''
assignees: ''

---

<!-- Ask David for help you to contribute https://calendly.com/argilla-office-hours/30min or feel free to submit a pull request straight away: https://github.com/argilla-io/argilla/pulls or -->

## Which page or section is this issue related to?
<!-- Please include the URL and/or source. -->
13 changes: 6 additions & 7 deletions .github/ISSUE_TEMPLATE/🪲-bug-python-deployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,29 @@ about: Python or Deployment bugs and unexpected behavior
title: "[BUG-python/deployment]"
labels: ''
assignees: ''

---

<!-- Ask David for help you to contribute https://calendly.com/argilla-office-hours/30min or feel free to submit a pull request straight away: https://github.com/argilla-io/argilla/pulls or -->

**Describe the bug**
A clear and concise description of what the bug is.
<!-- A clear and concise description of what the bug is. -->

**Stacktrace and Code to create the bug**
<!--
```python
my_python_code
```
```bash
my_bash_code
```
-->

**Expected behavior**
A clear and concise description of what you expected to happen.
<!-- A clear and concise description of what you expected to happen. -->

<!-- Since version 1.16.0 you can use `python -m argilla info` command to easily get the used versions -->
**Environment:**
<!-- Since version 1.16.0 you can use `python -m argilla info` command to easily get the used versions -->
- Argilla Version [e.g. 1.0.0]:
- ElasticSearch Version [e.g. 7.10.2]:
- Docker Image (optional) [e.g. argilla:v1.0.0]:

**Additional context**
Add any other context about the problem here.
<!-- Add any other context about the problem here. -->
30 changes: 0 additions & 30 deletions .github/PULL_REQUEST_TEMPLATE/bug.md

This file was deleted.

29 changes: 0 additions & 29 deletions .github/PULL_REQUEST_TEMPLATE/docs.md

This file was deleted.

33 changes: 0 additions & 33 deletions .github/PULL_REQUEST_TEMPLATE/features.md

This file was deleted.

4 changes: 3 additions & 1 deletion .github/actions/generate-credentials/app/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ def generate_credentials() -> Dict[str, Any]:
credentials = {}
for user in ["owner", "admin", "annotator"]:
logging.info(f"Generating random credential for user '{user}'")
password = generate_password_from_secret(secret=SECRET, salt=f"{GITHUB_REF}/{user}", length=32)
password = generate_password_from_secret(
secret=SECRET, salt=f"{GITHUB_REF}/{user}", length=32
)
credentials[user] = password
return credentials

Expand Down
16 changes: 12 additions & 4 deletions .github/actions/slack-post-credentials/app/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@ def get_slack_channel_id(client: WebClient) -> Union[str, None]:
for channel in result["channels"]:
if channel["name"] == SLACK_CHANNEL_NAME:
channel_id = channel["id"]
logging.info(f"Found channel id for '{SLACK_CHANNEL_NAME}' channel: '{channel_id}'")
logging.info(
f"Found channel id for '{SLACK_CHANNEL_NAME}' channel: '{channel_id}'"
)
return channel_id


Expand All @@ -87,7 +89,9 @@ def get_pr_url(pr_number: int) -> str:
return f"https://github.com/argilla-io/argilla/pull/{pr_number}"


def get_thread_ts_pr_message(client: WebClient, channel_id: str, pr_number: int) -> Union[str, None]:
def get_thread_ts_pr_message(
client: WebClient, channel_id: str, pr_number: int
) -> Union[str, None]:
response = client.conversations_history(channel=channel_id, limit=1000)
response.validate()

Expand Down Expand Up @@ -119,7 +123,9 @@ def bot_already_replied(client: WebClient, channel_id: str, thread_ts: str) -> b
return False


def reply_thread_with_credentials(client: WebClient, channel_id: str, thread_ts: str) -> None:
def reply_thread_with_credentials(
client: WebClient, channel_id: str, thread_ts: str
) -> None:
client.chat_postMessage(
channel=channel_id,
text=f"Credentials for PR deployed environment (use as password and API key):\n- URL: {URL}\n- owner: '{OWNER}'\n- admin: '{ADMIN}'\n- annotator: '{ANNOTATOR}'",
Expand Down Expand Up @@ -153,7 +159,9 @@ def reply_thread_with_credentials(client: WebClient, channel_id: str, thread_ts:
pr_number = get_pull_request_number()
if pr_number is None:
logging.error(f"Could not parse `GITHUB_REF` ({GITHUB_REF}) to get PR number")
raise ValueError(f"Could not parse `GITHUB_REF` ({GITHUB_REF}) to get PR number")
raise ValueError(
f"Could not parse `GITHUB_REF` ({GITHUB_REF}) to get PR number"
)

client = get_slack_client()

Expand Down
56 changes: 19 additions & 37 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,46 +1,28 @@
# Argilla Community Growers

Thanks for your contribution! As part of our Community Growers initiative 🌱, we're donating Justdiggit bunds in your name to reforest sub-Saharan Africa. To claim your Community Growers certificate, please contact David Berenstein in our Slack community or fill in this form https://tally.so/r/n9XrxK once your PR has been merged.

# Pull Request Templates

Please go the the `Preview` tab and select the appropriate sub-template:

* [🐞-bug](?expand=1&template=bug.md)
* [📚-documentation](?expand=1&template=docs.md)
* [🆕-features](?expand=1&template=features.md)

# Generic Pull Request Template

Please include a summary of the changes and the related issue. Please also include relevant motivation and context. List any dependencies that are required for this change.
# Pull Request Template
<!-- Please include a summary of the changes and the related issue. Please also include relevant motivation and context. List any dependencies that are required for this change. -->

Closes #<issue_number>

**Type of change**
<!-- Please delete options that are not relevant. Remember to title the PR according to the type of change -->

(Please delete options that are not relevant. Remember to title the PR according to the type of change)

- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
- [ ] Refactor (change restructuring the codebase without changing functionality)
- [ ] Improvement (change adding some improvement to an existing functionality)
- [ ] Documentation update
- Bug fix (non-breaking change which fixes an issue)
- New feature (non-breaking change which adds functionality)
- Breaking change (fix or feature that would cause existing functionality to not work as expected)
- Refactor (change restructuring the codebase without changing functionality)
- Improvement (change adding some improvement to an existing functionality)
- Documentation update

**How Has This Been Tested**

(Please describe the tests that you ran to verify your changes. And ideally, reference `tests`)

- [ ] Test A
- [ ] Test B
<!-- Please add some reference about how your feature has been tested. -->

**Checklist**

- [ ] I added relevant documentation
- [ ] follows the style guidelines of this project
- [ ] I did a self-review of my code
- [ ] I made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my feature works
- [ ] I filled out [the contributor form](https://tally.so/r/n9XrxK) (see text above)
- [ ] I have added relevant notes to the CHANGELOG.md file (See https://keepachangelog.com/)
<!-- Please go over the list and make sure you've taken everything into account -->

- I added relevant documentation
- follows the style guidelines of this project
- I did a self-review of my code
- I made corresponding changes to the documentation
- I confirm My changes generate no new warnings
- I have added tests that prove my fix is effective or that my feature works
- I have added relevant notes to the CHANGELOG.md file (See https://keepachangelog.com/)
15 changes: 3 additions & 12 deletions .github/workflows/argilla-frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,13 @@ concurrency:
cancel-in-progress: true

on:

workflow_call:

pull_request:
paths:
- "argilla-frontend/**"
types:
- opened
- edited
- reopened
- synchronize
- ready_for_review

jobs:

build:
name: Build argilla-frontend
runs-on: ubuntu-latest
Expand All @@ -28,7 +20,6 @@ jobs:
working-directory: argilla-frontend

steps:

- name: Checkout Code 🛎
uses: actions/checkout@v4

Expand Down Expand Up @@ -61,7 +52,7 @@ jobs:
build_dev_docker_image:
name: Build development argilla-fronted docker image
needs: build
uses: ./.github/workflows/argilla.build-push-dev-frontend-docker.yml
uses: ./.github/workflows/argilla-frontend.build-push-dev-frontend-docker.yml
if: |
!cancelled() &&
github.event_name == 'pull_request' && github.event.pull_request.draft == false
Expand All @@ -75,7 +66,7 @@ jobs:

deploy:
name: Deploy pr environment
uses: ./.github/workflows/argilla.deploy-environment.yml
uses: ./.github/workflows/argilla-frontend.deploy-environment.yml
needs: build_dev_docker_image
if: |
!cancelled() &&
Expand All @@ -84,4 +75,4 @@ jobs:
with:
image-name: argilla/argilla-frontend-for-dev
image-version: ${{ needs.build_dev_docker_image.outputs.version }}
secrets: inherit
secrets: inherit
Loading

0 comments on commit 744ce5c

Please sign in to comment.