Skip to content

Commit

Permalink
Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
frascuchon committed Aug 26, 2024
2 parents 3990097 + c03edfb commit 4510b3e
Show file tree
Hide file tree
Showing 48 changed files with 453 additions and 498 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ import { useUser } from "~/v1/infrastructure/services/useUser";

const HF_PREFIX = "[hf_]";
const LOCAL_PREFIX = "[local_]";
const HF_OWNER = "[HF_OWNER]";
const HF_SPACE_NAME = "[HF_SPACE_NAME]";
const HF_HOST = "[HF_HOST]";
const USER_API_KEY = "[USER_API_KEY]";
const LOCAL_HOST = "[LOCAL_HOST]";

Expand Down Expand Up @@ -51,10 +50,7 @@ export const useDatasetEmptyViewModel = () => {

if (row.includes(HF_PREFIX)) {
content.push(
row
.replace(HF_PREFIX, "")
.replace(HF_OWNER, hfEnvironment.user)
.replace(HF_SPACE_NAME, hfEnvironment.space)
row.replace(HF_PREFIX, "").replace(HF_HOST, hfEnvironment.host)
);

continue;
Expand Down
4 changes: 2 additions & 2 deletions argilla-frontend/docs/snippets/start_page.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import argilla as rg

client = rg.Argilla(
[local_]api_url="[LOCAL_HOST]",
[hf_]api_url="https://[HF_OWNER]-[HF_SPACE_NAME].hf.space",
[hf_]api_url="https://[HF_HOST]",
api_key="[USER_API_KEY]"
)
```
Expand Down Expand Up @@ -60,7 +60,7 @@ settings = rg.Settings(
)
dataset = rg.Dataset(
name=f"my_first_dataset",
workspace="<your-workspace>",
workspace="argilla", # change this to your workspace
settings=settings,
client=client,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export class Environment {
return {
space: this.huggingface.spaceRepoName,
user: this.huggingface.spaceAuthorName,
host: this.huggingface.spaceHost,
};
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ describe("useRunningEnvironment", () => {
expect(space).toEqual({
user: "USER_NAME_FAKE",
space: "AWESOME_SPACE",
host: "huggingface.co",
});
});
});
Expand Down
5 changes: 4 additions & 1 deletion argilla-server/tests/unit/validators/test_records_bulk.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ async def configure_dataset(self) -> Dataset:
dataset = await DatasetFactory.create(status="ready")

await TextFieldFactory.create(name="text", dataset=dataset)
await TextFieldFactory.create(name="optional", dataset=dataset, required=False)
await dataset.awaitable_attrs.fields

await dataset.awaitable_attrs.metadata_properties
Expand All @@ -40,7 +41,9 @@ async def test_records_bulk_create_validator(self, db: AsyncSession):

records_create = RecordsBulkCreate(
items=[
RecordCreate(fields={"text": "hello world"}, metadata={"source": "test"}),
RecordCreate(fields={"text": "hello world", "optional": "optional"}, metadata={"source": "test"}),
RecordCreate(fields={"text": "hello world", "optional": ""}, metadata={"source": "test"}),
RecordCreate(fields={"text": "hello world", "optional": None}, metadata={"source": "test"}),
]
)

Expand Down
22 changes: 21 additions & 1 deletion argilla/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,27 @@ These are the section headers that we use:
* "Security" in case of vulnerabilities.
-->

## [Unreleased]()
## [2.0.1](https://github.com/argilla-io/argilla/compare/v2.0.0...releases/2.0.1)

### Fixed

- Fixed error when creating optional fields. ([#5362](https://github.com/argilla-io/argilla/pull/5362))
- Fixed error creating integer and float metadata with `visible_for_annotators`. ([#5364](https://github.com/argilla-io/argilla/pull/5364))
- Fixed error when logging records with `suggestions` or `responses` for non-existent questions. ([#5396](https://github.com/argilla-io/argilla/pull/5396) by @maxserras)
- Fixed error from conflicts in testing suite when running tests in parallel. ([#5349](https://github.com/argilla-io/argilla/commit/1119b164d0623170d44561c6b75d439d2dc96bd0))
- Fixed error in response model when creating a response with a `None` value. ([#5343](https://github.com/argilla-io/argilla/commit/9e3705061a2dd88a7852288d9f6fd1aaeaa9b062))

### Changed

- Changed `from_hub` method to raise an error when a dataset with the same name exists. ([#5258](https://github.com/argilla-io/argilla/pull/5358))
- Changed `log` method when ingesting records with no known keys to raise a descriptive error. ([#5356](https://github.com/argilla-io/argilla/pull/5356))
- Changed `code snippets` to add new datasets ([#5395](https://github.com/argilla-io/argilla/pull/5395))

### Added

- Added Google Analytics to the documentation site. ([#5366](https://github.com/argilla-io/argilla/pull/5366))
- Added frontend skeletons to progress metrics to optimise load time and improve user experience. ([#5391](https://github.com/argilla-io/argilla/pull/5391))
- Added documentation in methods in API references for the Python SDK. ([#5400](https://github.com/argilla-io/argilla/commit/a6fc0117bc4923aec0be80df27eb79ddf3f007c7))

### Fixed

Expand Down
8 changes: 4 additions & 4 deletions argilla/docs/community/contributor.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Thank you for investing your time in contributing to the project! Any contributi
* **Discord**: You are welcome to join the [Argilla Discord community](http://hf.co/join/discord), where you can keep in touch with other users, contributors and the Argilla team. In the following [section](#first-contact-in-discord), you can find more information on how to get started in Discord.
* **Git**: This is a very useful tool to keep track of the changes in your files. Using the command-line interface (CLI), you can make your contributions easily. For that, you need to have it [installed and updated](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) on your computer.
* **GitHub**: It is a platform and cloud-based service that uses git and allows developers to collaborate on projects. To contribute to Argilla, you'll need to create an account. Check the [Contributor Workflow with Git and Github](#contributor-workflow-with-git-and-github) for more info.
* **Developer Documentation**: To collaborate, you'll need to set up an efficient environment. Check the [developer documentation](../getting_started/installation.md) to know how to do it.
* **Developer Documentation**: To collaborate, you'll need to set up an efficient environment. Check the [Server](https://github.com/argilla-io/argilla/blob/develop/argilla-server/README.md) and [Frontend](https://github.com/argilla-io/argilla/blob/develop/argilla-frontend/README.md) READMEs to know how to do it.
* **Schedule a meeting with our developer advocate**: If you have more questions, do not hesitate to contact our developer advocate and [schedule a meeting](https://calendly.com/david-berenstein-huggingface/30min).

## First Contact in Discord
Expand Down Expand Up @@ -70,7 +70,7 @@ git clone https://github.com/[your-github-username]/argilla.git
cd argilla
```

To keep your fork’s main/develop branch up to date with our repo, add it as an upstream remote branch. For more info, check the [documentation](../getting_started/installation.md).
To keep your fork’s main/develop branch up to date with our repo, add it as an upstream remote branch.

```sh
git remote add upstream https://github.com/argilla-io/argilla.git
Expand Down Expand Up @@ -117,11 +117,11 @@ A sample addition would be:
- Fixed the key errors for the `init` method ([#NUMBER_OF_PR](LINK_TO_PR)). Contributed by @github_handle.
```

You can have a look at the [CHANGELOG.md](https://raw.githubusercontent.com/argilla-io/argilla/develop/CHANGELOG.md) file to see more cases and examples.
You can have a look at the [CHANGELOG.md](https://github.com/argilla-io/argilla/blob/develop/argilla/CHANGELOG.md)) file to see more cases and examples.

### Make changes and push them

Make the changes you want in your local repository, and test that everything works and you are following the guidelines. Check the [documentation](../getting_started/installation.md) for more information about the development.
Make the changes you want in your local repository, and test that everything works and you are following the guidelines.

Once you have finished, you can check the status of your repository and synchronize with the upstreaming repo with the following command:

Expand Down
71 changes: 0 additions & 71 deletions argilla/docs/getting_started/installation.md

This file was deleted.

Loading

0 comments on commit 4510b3e

Please sign in to comment.