Skip to content

Commit

Permalink
Merge branch 'v1.2-dev' into make-task-review-server
Browse files Browse the repository at this point in the history
  • Loading branch information
meta-paul committed Oct 26, 2023
2 parents 88df9ad + ac52ad5 commit a8b8f40
Show file tree
Hide file tree
Showing 824 changed files with 39,869 additions and 673 deletions.
28 changes: 14 additions & 14 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions .yarn/plugins/@yarnpkg/plugin-version.cjs

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!---
Copyright (c) Meta Platforms and its affiliates.
This source code is licensed under the MIT license found in the
LICENSE file in the root directory of this source tree.
-->

# Code of Conduct

## Our Pledge
Expand Down
6 changes: 6 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!---
Copyright (c) Meta Platforms and its affiliates.
This source code is licensed under the MIT license found in the
LICENSE file in the root directory of this source tree.
-->

# Contributing to Mephisto
We want to make contributing to this project as easy and transparent as
possible.
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) Facebook, Inc. and its affiliates.
Copyright (c) Meta Platforms and its affiliates.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!---
Copyright (c) Meta Platforms and its affiliates.
This source code is licensed under the MIT license found in the
LICENSE file in the root directory of this source tree.
-->

<p align="center">
<h1>
<img width="250px" src="docs/web/static/img/logo.svg" alt="Mephisto" />
Expand Down
4 changes: 4 additions & 0 deletions docker/docker-compose.dev.vscode.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Copyright (c) Meta Platforms and its affiliates.
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.

version: "3"

services:
Expand Down
4 changes: 4 additions & 0 deletions docker/docker-compose.dev.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Copyright (c) Meta Platforms and its affiliates.
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.

version: "3"

services:
Expand Down
5 changes: 5 additions & 0 deletions docker/entrypoints/server.mturk.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
#!/bin/sh

# Copyright (c) Meta Platforms and its affiliates.
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.

set -e

pip install pytest
Expand Down
5 changes: 5 additions & 0 deletions docker/entrypoints/server.prolific.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
#!/bin/sh

# Copyright (c) Meta Platforms and its affiliates.
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.

set -e

pip install pytest black
Expand Down
6 changes: 6 additions & 0 deletions docs/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!---
Copyright (c) Meta Platforms and its affiliates.
This source code is licensed under the MIT license found in the
LICENSE file in the root directory of this source tree.
-->

# Mephisto Docs

- Looking to get set-up and running quickly with Mephisto? Check out the **[10 minute quickstart](https://mephisto.ai/docs/guides/quickstart)**.
Expand Down
6 changes: 6 additions & 0 deletions docs/legacy/hydra_migration.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!---
Copyright (c) Meta Platforms and its affiliates.
This source code is licensed under the MIT license found in the
LICENSE file in the root directory of this source tree.
-->

# Transitioning from ARG_STRING to Hydra
As Mephisto has moved away from the `ARG_STRING` in [#246](https://github.com/facebookresearch/Mephisto/pull/246), all existing scripts that used to use the `ARG_STRING` will need to use Hydra moving forward.

Expand Down
6 changes: 6 additions & 0 deletions docs/storybook/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!---
Copyright (c) Meta Platforms and its affiliates.
This source code is licensed under the MIT license found in the
LICENSE file in the root directory of this source tree.
-->

# Storybook

This storybook houses UI components from the `@annotated/*` packages as well as other Mephisto front-end components.
Expand Down
6 changes: 6 additions & 0 deletions docs/storybook/public/index.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!---
Copyright (c) Meta Platforms and its affiliates.
This source code is licensed under the MIT license found in the
LICENSE file in the root directory of this source tree.
-->

<!DOCTYPE html>
<html lang="en">
<head>
Expand Down
6 changes: 6 additions & 0 deletions docs/storybook/src/stories/GlobalContextStore.stories.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/*
* Copyright (c) Meta Platforms and its affiliates.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

import React from "react";
import Store, { useStore } from "global-context-store";

Expand Down
6 changes: 6 additions & 0 deletions docs/storybook/src/stories/InterpolatedBBox.stories.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/*
* Copyright (c) Meta Platforms and its affiliates.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

import React from "react";
import Wrapper from "./Wrapper";

Expand Down
6 changes: 6 additions & 0 deletions docs/storybook/src/stories/Keypoints.stories.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/*
* Copyright (c) Meta Platforms and its affiliates.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

import React from "react";
import Wrapper from "./Wrapper";
import { Pose } from "@annotated/keypoint";
Expand Down
6 changes: 6 additions & 0 deletions docs/storybook/src/stories/Layers.stories.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/*
* Copyright (c) Meta Platforms and its affiliates.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

import React from "react";
import Wrapper from "./Wrapper";
import { AppShell, Layer } from "@annotated/shell";
Expand Down
6 changes: 6 additions & 0 deletions docs/storybook/src/stories/Panels.stories.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/*
* Copyright (c) Meta Platforms and its affiliates.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

import React from "react";
import Wrapper from "./Wrapper";

Expand Down
6 changes: 6 additions & 0 deletions docs/storybook/src/stories/VideoPlayer.stories.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/*
* Copyright (c) Meta Platforms and its affiliates.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

import React from "react";
import Wrapper from "./Wrapper";

Expand Down
6 changes: 6 additions & 0 deletions docs/storybook/src/stories/Wrapper.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/*
* Copyright (c) Meta Platforms and its affiliates.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

import React from "react";

import "@annotated/shell/build/main.css";
Expand Down
6 changes: 6 additions & 0 deletions docs/web/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!---
Copyright (c) Meta Platforms and its affiliates.
This source code is licensed under the MIT license found in the
LICENSE file in the root directory of this source tree.
-->

# Mephisto Docs Website

This website is built using [Docusaurus 2](https://docusaurus.io/), a modern static website generator.
Expand Down
6 changes: 6 additions & 0 deletions docs/web/babel.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/*
* Copyright (c) Meta Platforms and its affiliates.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

module.exports = {
presets: [require.resolve("@docusaurus/core/lib/babel/preset")],
};
6 changes: 6 additions & 0 deletions docs/web/blog/2022-03-22-mephisto-1.0.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!---
Copyright (c) Meta Platforms and its affiliates.
This source code is licensed under the MIT license found in the
LICENSE file in the root directory of this source tree.
-->

---
slug: mephisto-1.0
title: Announcing Mephisto 1.0
Expand Down
4 changes: 4 additions & 0 deletions docs/web/blog/authors.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Copyright (c) Meta Platforms and its affiliates.
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.

endi:
name: Endilie Yacop Sucipto
title: Maintainer of Docusaurus
Expand Down
6 changes: 6 additions & 0 deletions docs/web/docs/explanations/architect_api.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!---
Copyright (c) Meta Platforms and its affiliates.
This source code is licensed under the MIT license found in the
LICENSE file in the root directory of this source tree.
-->

# Architects, Routers, and `mephisto-task`: The Architect API.

The Architect API is what allows Mephisto to completely abstract away the process of getting workers to operate in Mephisto tasks. In short, it aims to cover 4 primary functions:
Expand Down
6 changes: 6 additions & 0 deletions docs/web/docs/explanations/architecture_overview.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!---
Copyright (c) Meta Platforms and its affiliates.
This source code is licensed under the MIT license found in the
LICENSE file in the root directory of this source tree.
-->

# Mephisto Architecture

This document seeks to explain the ideas that guided the creation of Mephisto. It will speak about the broad categories of how Mephisto works and how these parts are supposed to play together. It speaks a lot about the design goals of the Mephisto architecture. It isn't a perfect 1:1 representation of how the code is organized at the moment, but rather the ideal we were striving to reach. Understanding these ideals makes it _easier_ to understand Mephisto, both for usage and for joining in on development.
Expand Down
4 changes: 4 additions & 0 deletions docs/web/docs/guides/how_to_contribute/_category_.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Copyright (c) Meta Platforms and its affiliates.
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.

label: "How to Contribute"
collapsed: true
position: 4
6 changes: 6 additions & 0 deletions docs/web/docs/guides/how_to_contribute/backend_development.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!---
Copyright (c) Meta Platforms and its affiliates.
This source code is licensed under the MIT license found in the
LICENSE file in the root directory of this source tree.
-->

---
sidebar_position: 3
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!---
Copyright (c) Meta Platforms and its affiliates.
This source code is licensed under the MIT license found in the
LICENSE file in the root directory of this source tree.
-->

---
sidebar_position: 2
---
Expand Down
6 changes: 6 additions & 0 deletions docs/web/docs/guides/how_to_contribute/getting_started.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!---
Copyright (c) Meta Platforms and its affiliates.
This source code is licensed under the MIT license found in the
LICENSE file in the root directory of this source tree.
-->

---
sidebar_position: 1
---
Expand Down
4 changes: 4 additions & 0 deletions docs/web/docs/guides/how_to_use/_category_.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Copyright (c) Meta Platforms and its affiliates.
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.

label: "In-depth use"
collapsed: true
position: 3
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Copyright (c) Meta Platforms and its affiliates.
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.

label: "Efficiency and Organization"
collapsed: true
position: 4
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!---
Copyright (c) Meta Platforms and its affiliates.
This source code is licensed under the MIT license found in the
LICENSE file in the root directory of this source tree.
-->

# Common Configurations and FAQs

This document contains some Mephisto usage patterns that should be fairly common, as well as usage tips and other know-how.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!---
Copyright (c) Meta Platforms and its affiliates.
This source code is licensed under the MIT license found in the
LICENSE file in the root directory of this source tree.
-->

# Using Docker

Some users prefer to keep Mephisto entirely contained. Docker is one option for being able to do this.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!---
Copyright (c) Meta Platforms and its affiliates.
This source code is licensed under the MIT license found in the
LICENSE file in the root directory of this source tree.
-->

---
sidebar_position: 2
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!---
Copyright (c) Meta Platforms and its affiliates.
This source code is licensed under the MIT license found in the
LICENSE file in the root directory of this source tree.
-->

---
sidebar_position: 1
---
Expand Down
4 changes: 4 additions & 0 deletions docs/web/docs/guides/how_to_use/task_creation/_category_.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Copyright (c) Meta Platforms and its affiliates.
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.

label: "Creating a Task"
collapsed: false
position: 1
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!---
Copyright (c) Meta Platforms and its affiliates.
This source code is licensed under the MIT license found in the
LICENSE file in the root directory of this source tree.
-->

---
sidebar_position: 1
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!---
Copyright (c) Meta Platforms and its affiliates.
This source code is licensed under the MIT license found in the
LICENSE file in the root directory of this source tree.
-->

---
sidebar_position: 2
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Copyright (c) Meta Platforms and its affiliates.
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.

label: "Worker Experience"
collapsed: false
position: 2
6 changes: 6 additions & 0 deletions docs/web/docs/guides/how_to_use/worker_experience/feedback.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!---
Copyright (c) Meta Platforms and its affiliates.
This source code is licensed under the MIT license found in the
LICENSE file in the root directory of this source tree.
-->

---
sidebar_position: 3
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!---
Copyright (c) Meta Platforms and its affiliates.
This source code is licensed under the MIT license found in the
LICENSE file in the root directory of this source tree.
-->

---
sidebar_position: 1
---
Expand Down
Loading

0 comments on commit a8b8f40

Please sign in to comment.