Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v1.2 #1092

Merged
merged 52 commits into from
Dec 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
c8faeb9
[WIP] Task review app - initial API commit
meta-paul Aug 25, 2023
5b5a733
[WIP] Task review app - moved unit_review to Mephisto DB and updated …
meta-paul Aug 29, 2023
1ddfb81
[WIP] Task review app - initial UI commit
meta-paul Aug 31, 2023
16e6e5d
[WIP] Task review app - added modal components, updated /stats endpoint
meta-paul Sep 2, 2023
03d4e8f
[WIP] Task review app - added getting units and stats data
meta-paul Sep 9, 2023
5a0fc23
[WIP] Task review app - implemented demo display of mnist task data
meta-paul Sep 13, 2023
1162f27
[WIP] Task review app - made transition between units and improved el…
meta-paul Sep 13, 2023
8f794bc
[WIP] Task review app - small fixes
meta-paul Sep 14, 2023
6cbf7fb
Laying down basic strokes of standard get_data response
JackUrb Sep 14, 2023
439bd46
[WIP] Task review app - more fixes
meta-paul Sep 18, 2023
c9b25c1
Merge pull request #1065 from facebookresearch/data-api-draft
JackUrb Sep 18, 2023
624e79d
Update run_task.py
JackUrb Sep 21, 2023
86c8442
Task review app - Ported mnist app to load during task review
meta-paul Sep 21, 2023
4c291e3
Task review app - Added JSON viewer as fallback and fixed a bug
meta-paul Sep 25, 2023
96bff4b
Task review app - improved worker qualification endpoint
meta-paul Sep 25, 2023
75bf0e3
Task review app - linted code with Prettier
meta-paul Sep 26, 2023
c9489d9
Task review app - Fixed worker picking order during review
meta-paul Sep 27, 2023
259739a
Task review app - added creating Unit Review to Agent logic
meta-paul Oct 3, 2023
15689e2
Task review app - added a separate review-specific build for Task com…
meta-paul Oct 4, 2023
9318cac
Task review app - renamed 'tips' to 'bonus', updated docs
meta-paul Oct 4, 2023
ebe5cd5
removed deprecated mephisto client code
meta-paul Oct 5, 2023
1654887
Task review app - addressed PR review comments
meta-paul Oct 6, 2023
418c4c7
Fixed linting warnings
meta-paul Oct 6, 2023
9a65339
Added script for updating copyright headers
meta-paul Oct 12, 2023
deb096d
Updated copyright headers across the code
meta-paul Oct 12, 2023
2387d11
Added docs for dockerization support
meta-paul Oct 17, 2023
e04a812
Addressed review comments
meta-paul Oct 17, 2023
e7230c3
Addressed review comments
meta-paul Oct 18, 2023
913ce6a
Merge pull request #1075 from facebookresearch/add-copyright-headers
meta-paul Oct 18, 2023
de9e7ae
Prevent oversampling of study submissions by any single worker
meta-paul Oct 19, 2023
88df9ad
Added a single script for launching TaskReview app server and client
meta-paul Oct 20, 2023
ac52ad5
Fixed failing tests
meta-paul Oct 25, 2023
31374ca
Consolidated parameter names for max submissions per worker
meta-paul Oct 26, 2023
a8b8f40
Merge branch 'v1.2-dev' into make-task-review-server
meta-paul Oct 26, 2023
5b07bcc
Deprecated version of MNIST app without TaskReview support
meta-paul Oct 26, 2023
221bae3
Added step-by-step Mephisto guide
meta-paul Oct 27, 2023
b527961
Fixed excluding workers in studies with no qualifications
meta-paul Nov 1, 2023
6dfb39f
Added option to create new qualification during task review
meta-paul Nov 6, 2023
f2fe874
Tested TaskReview edge cases for Prolific
meta-paul Nov 6, 2023
ecfa55b
Added TaskReview API documentation
meta-paul Nov 6, 2023
9933658
Covered TaskReview app with unittests
meta-paul Nov 10, 2023
cc1c2e0
Fixed unittests for Prolific integration
meta-paul Nov 10, 2023
3494563
Added results export in JSON format for TaskReview app
meta-paul Nov 16, 2023
c5c5bc0
Added sanity check for Mturk sandbox testing
meta-paul Nov 16, 2023
650326a
Fixed failing e2e Cypress tests
meta-paul Nov 25, 2023
f26decb
Merge pull request #1058 from facebookresearch/make-task-review-server
meta-paul Nov 30, 2023
e177e7b
Merge pull request #1080 from facebookresearch/prevent-study-oversamp…
meta-paul Nov 30, 2023
01af029
Revert "Prevent oversampling of study submissions by any single worker"
meta-paul Nov 30, 2023
6644a4a
Merge pull request #1088 from facebookresearch/revert-1080-prevent-st…
meta-paul Nov 30, 2023
98c5f09
Addressed v1.2 review comments
meta-paul Dec 15, 2023
f82c7be
Updated copyright notices
meta-paul Dec 15, 2023
aba6369
Fixed failing checks
meta-paul Dec 18, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Binary file added ._data
Binary file not shown.
8 changes: 6 additions & 2 deletions .github/workflows/cypress-end-to-end-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ on:
branches: [main]
paths-ignore:
- "**.md"
env:
HYDRA_FULL_ERROR: 1
jobs:
# This job is made to setup path filtering, learn more about it here: https://github.com/facebookresearch/Mephisto/pull/857
changes:
Expand Down Expand Up @@ -108,7 +110,7 @@ jobs:
browser: chrome
project: ./mephisto/abstractions/blueprints/static_html_task/source
config-file: ./cypress.config.js
start: python ./examples/simple_static_task/static_test_script.py
start: python ./examples/simple_static_task/run_task.py
wait-on: "http://localhost:3000/?worker_id=x&assignment_id=1"
headless: true

Expand Down Expand Up @@ -273,7 +275,9 @@ jobs:
node-version: 16.16.0

- name: 🤖 Install Mephisto
run: pip install -e .
run: |
pip install -e .
pip install detoxify

- name: 🖋 Create data directory
run: mkdir -p ~/mephisto/data
Expand Down
7 changes: 5 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ mephisto/scripts/metrics/*

# Examples
examples/simple_static_task/hydra_configs/conf/*
!examples/simple_static_task/hydra_configs/conf/example.yaml
!examples/simple_static_task/hydra_configs/conf/example*.yaml
!examples/simple_static_task/hydra_configs/conf/prolific_example.yaml
!examples/simple_static_task/hydra_configs/conf/onboarding_example.yaml
!examples/simple_static_task/hydra_configs/conf/onboarding_example*.yaml
examples/**/build/*

# PyCharm
Expand Down Expand Up @@ -55,3 +55,6 @@ aws_credentials
docker-compose.local.*
env.local
my-review-interface
docker/entrypoints/*.sh
!docker/entrypoints/server.mturk.sh
!docker/entrypoints/server.prolific.sh
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.

17 changes: 8 additions & 9 deletions .yarn/releases/yarn-3.2.4.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 Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ COPY . /mephisto
RUN mkdir ~/.mephisto

# Create the main Mephisto data directory
RUN mkdir /mephisto/data
RUN mkdir -p /mephisto/data

# Write the mephisto config file manually for now to avoid prompt.
# For bash-style string $ expansion for newlines,
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
8 changes: 8 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 All @@ -17,6 +23,8 @@ You can find complete details about the project on our [docs website](https://me

[Get started in 10 minutes](https://mephisto.ai/docs/guides/quickstart)

[How to run projects](mephisto/README.md)

## Want to help?

Check out our [guidelines for contributing](https://github.com/facebookresearch/Mephisto/blob/main/CONTRIBUTING.md) and then take a look at some of our tagged issues: [good first issue](https://github.com/facebookresearch/Mephisto/labels/good%20first%20issue), [help wanted](https://github.com/facebookresearch/Mephisto/labels/help%20wanted).
Expand Down
10 changes: 7 additions & 3 deletions docker/docker-compose.dev.vscode.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
# 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:
fb_mephisto_vscode:
container_name: fb_mephisto_vscode
mephisto_dc_vscode:
container_name: mephisto_dc_vscode
build:
context: ..
dockerfile: Dockerfile
Expand All @@ -26,6 +30,6 @@ services:
/tmp/debugpy
--wait-for-client
--listen 0.0.0.0:5678
/mephisto/examples/simple_static_task/static_test_script.py
/mephisto/examples/simple_static_task/run_task.py
",
]
8 changes: 6 additions & 2 deletions docker/docker-compose.dev.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
# 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:
fb_mephisto:
container_name: fb_mephisto
mephisto_dc:
container_name: mephisto_dc
build:
context: ..
dockerfile: Dockerfile
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
Loading
Loading