Skip to content
This repository has been archived by the owner on Jan 20, 2023. It is now read-only.

Ordered RC examples #896

Merged
merged 27 commits into from
Mar 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
5b43ab1
Make Vilbert VQA refer to the right model
dirkgr Feb 11, 2021
1e09d59
Don't say tagging
dirkgr Feb 11, 2021
3fecffc
Newer version of allennlp and allennlp-models
dirkgr Feb 11, 2021
4c930cd
Update the way VilBERT runs
dirkgr Feb 11, 2021
b32fe68
Merge remote-tracking branch 'origin/master' into DemoModelSweep
dirkgr Feb 25, 2021
56b272c
Merge remote-tracking branch 'origin/master' into DemoModelSweep
dirkgr Feb 26, 2021
e2afe86
Print output during `docker build`
dirkgr Mar 2, 2021
581ab20
Upgrade version of allennlp
dirkgr Mar 2, 2021
dc58bf4
Merge remote-tracking branch 'origin/master' into DemoModelSweep
dirkgr Mar 3, 2021
8c48c56
Upgrade to 2.x
dirkgr Mar 3, 2021
fb17824
Print output during `docker build`
dirkgr Mar 2, 2021
5de2e91
Update model cards
dirkgr Mar 4, 2021
e9456d1
Merge branch 'SweepNotBrokenDammit' into DemoModelSweep
dirkgr Mar 4, 2021
3b864fe
Merge remote-tracking branch 'origin/master' into DemoModelSweep
dirkgr Mar 4, 2021
5a32efa
Removes semantic parsing stuff
dirkgr Mar 10, 2021
4ebac8e
Update -models to fix coref
dirkgr Mar 10, 2021
440fa00
Updates version of -models
dirkgr Mar 12, 2021
540e64e
Fixes ./demo so that it behaves correctly while not capturing the out…
dirkgr Mar 12, 2021
419812b
Merge remote-tracking branch 'origin/master' into DemoModelSweep
dirkgr Mar 17, 2021
cc8e751
Revert "Removes semantic parsing stuff"
dirkgr Mar 17, 2021
e4e2524
Makes the semantic parsing models work again
dirkgr Mar 18, 2021
0ddd3db
Hopefully fixes the atis_parser test
dirkgr Mar 18, 2021
a140d36
Fix nlvr_parser and wikitables_parser too
dirkgr Mar 18, 2021
467471a
Adds missing files
dirkgr Mar 18, 2021
5fe66d8
Add support for categorized examples. (#897)
codeviking Mar 18, 2021
812e5c6
Merge remote-tracking branch 'origin/master' into OrderedRcExamples
dirkgr Mar 20, 2021
c054008
Tasks depends on regular allennlp again
dirkgr Mar 26, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions api/allennlp_demo/tasks/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
FROM python:3.8

WORKDIR /app/

COPY allennlp_demo/tasks/requirements.txt requirements.txt
ENV ALLENNLP_VERSION_OVERRIDE allennlp
RUN pip install -r requirements.txt

COPY allennlp_demo/__init__.py allennlp_demo/__init__.py
COPY allennlp_demo/common allennlp_demo/common
COPY allennlp_demo/tasks allennlp_demo/tasks

# Ensure allennlp_demo module can be found by Python.
ENV PYTHONPATH /app/

# Ensure log messages written immediately instead of being buffered, which is
# useful if the app crashes so the logs won't get swallowed.
ENV PYTHONUNBUFFERED 1

ENTRYPOINT [ "python" ]
CMD [ "allennlp_demo/tasks/api.py" ]
4 changes: 4 additions & 0 deletions api/allennlp_demo/tasks/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
git+git://github.com/allenai/allennlp.git@main
git+git://github.com/allenai/allennlp-models.git@main
Flask==1.1.2
pytest==6.2.1
2 changes: 1 addition & 1 deletion ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"dependencies": {
"@allenai/eslint-config-varnish": "^1.0.3",
"@allenai/tugboat": "^1.0.7",
"@allenai/tugboat": "2.0.0",
"@allenai/varnish": "^2.0.16",
"@allenai/varnish-react-router": "^2.0.2",
"@ant-design/icons": "^4.4.0",
Expand Down
8 changes: 4 additions & 4 deletions ui/src/demos/constituency-parsing/Usage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

import React from 'react';
import { Models, Examples } from '@allenai/tugboat/context';
import { NoSelectedModelError, GroupedExamplesError } from '@allenai/tugboat/error';
import { isGroupedExamples } from '@allenai/tugboat/lib';
import { NoSelectedModelError, CategorizedExamplesError } from '@allenai/tugboat/error';
import { areCategorized } from '@allenai/tugboat/lib';

import { ModelUsage } from '../../components';

Expand All @@ -18,8 +18,8 @@ export const Usage = () => {
throw new NoSelectedModelError();
}

if (isGroupedExamples(examples)) {
throw new GroupedExamplesError();
if (areCategorized(examples)) {
throw new CategorizedExamplesError();
}

// TODO: This seems brittle. If the examples change this will fail at runtime.
Expand Down
8 changes: 4 additions & 4 deletions ui/src/demos/coreference-resolution/Usage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

import React from 'react';
import { Models, Examples } from '@allenai/tugboat/context';
import { NoSelectedModelError, GroupedExamplesError } from '@allenai/tugboat/error';
import { isGroupedExamples } from '@allenai/tugboat/lib';
import { NoSelectedModelError, CategorizedExamplesError } from '@allenai/tugboat/error';
import { areCategorized } from '@allenai/tugboat/lib';

import { ModelUsage } from '../../components';

Expand All @@ -18,8 +18,8 @@ export const Usage = () => {
throw new NoSelectedModelError();
}

if (isGroupedExamples(examples)) {
throw new GroupedExamplesError();
if (areCategorized(examples)) {
throw new CategorizedExamplesError();
}

// TODO: This seems brittle. If the examples change this will fail at runtime.
Expand Down
8 changes: 4 additions & 4 deletions ui/src/demos/dependency-parsing/Usage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

import React from 'react';
import { Models, Examples } from '@allenai/tugboat/context';
import { NoSelectedModelError, GroupedExamplesError } from '@allenai/tugboat/error';
import { isGroupedExamples } from '@allenai/tugboat/lib';
import { NoSelectedModelError, CategorizedExamplesError } from '@allenai/tugboat/error';
import { areCategorized } from '@allenai/tugboat/lib';

import { ModelUsage } from '../../components';

Expand All @@ -18,8 +18,8 @@ export const Usage = () => {
throw new NoSelectedModelError();
}

if (isGroupedExamples(examples)) {
throw new GroupedExamplesError();
if (areCategorized(examples)) {
throw new CategorizedExamplesError();
}

// TODO: This seems brittle. If the examples change this will fail at runtime.
Expand Down
8 changes: 4 additions & 4 deletions ui/src/demos/named-entity-recognition/Usage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

import React from 'react';
import { Models, Examples } from '@allenai/tugboat/context';
import { NoSelectedModelError, GroupedExamplesError } from '@allenai/tugboat/error';
import { isGroupedExamples } from '@allenai/tugboat/lib';
import { NoSelectedModelError, CategorizedExamplesError } from '@allenai/tugboat/error';
import { areCategorized } from '@allenai/tugboat/lib';

import { ModelUsage } from '../../components';

Expand All @@ -18,8 +18,8 @@ export const Usage = () => {
throw new NoSelectedModelError();
}

if (isGroupedExamples(examples)) {
throw new GroupedExamplesError();
if (areCategorized(examples)) {
throw new CategorizedExamplesError();
}

// TODO: This seems brittle. If the examples change this will fail at runtime.
Expand Down
8 changes: 4 additions & 4 deletions ui/src/demos/open-information-extraction/Usage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

import React from 'react';
import { Models, Examples } from '@allenai/tugboat/context';
import { NoSelectedModelError, GroupedExamplesError } from '@allenai/tugboat/error';
import { isGroupedExamples } from '@allenai/tugboat/lib';
import { NoSelectedModelError, CategorizedExamplesError } from '@allenai/tugboat/error';
import { areCategorized } from '@allenai/tugboat/lib';

import { ModelUsage } from '../../components';

Expand All @@ -18,8 +18,8 @@ export const Usage = () => {
throw new NoSelectedModelError();
}

if (isGroupedExamples(examples)) {
throw new GroupedExamplesError();
if (areCategorized(examples)) {
throw new CategorizedExamplesError();
}

// TODO: This seems brittle. If the examples change this will fail at runtime.
Expand Down
13 changes: 8 additions & 5 deletions ui/src/demos/reading-comprehension/Usage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

import React from 'react';
import { Models, Examples } from '@allenai/tugboat/context';
import { NoSelectedModelError, UngroupedExamplesError } from '@allenai/tugboat/error';
import { isGroupedExamples } from '@allenai/tugboat/lib';
import { NoSelectedModelError, UncategorizedExamplesError } from '@allenai/tugboat/error';
import { areCategorized } from '@allenai/tugboat/lib';

import { ModelUsage } from '../../components';

Expand All @@ -18,12 +18,15 @@ export const Usage = () => {
throw new NoSelectedModelError();
}

if (!isGroupedExamples(examples)) {
throw new UngroupedExamplesError();
if (!areCategorized(examples)) {
throw new UncategorizedExamplesError();
}

// TODO: This seems brittle. If the examples change this will fail at runtime.
const ex = examples['SQuAD-like Argument Finding'][2]; // matrix example
const ex = examples.find((ec) => ec.category === 'SQuAD-like Argument Finding')?.examples[2];
if (!ex) {
throw new Error('No example.');
}

const bashCommand = `
echo '{"passage": "${ex.passage.slice(0, 182)}.", "question": "${ex.question}"}' | \\
Expand Down
8 changes: 4 additions & 4 deletions ui/src/demos/semantic-role-labeling/Usage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

import React from 'react';
import { Models, Examples } from '@allenai/tugboat/context';
import { NoSelectedModelError, GroupedExamplesError } from '@allenai/tugboat/error';
import { isGroupedExamples } from '@allenai/tugboat/lib';
import { NoSelectedModelError, CategorizedExamplesError } from '@allenai/tugboat/error';
import { areCategorized } from '@allenai/tugboat/lib';

import { ModelUsage } from '../../components';

Expand All @@ -18,8 +18,8 @@ export const Usage = () => {
throw new NoSelectedModelError();
}

if (isGroupedExamples(examples)) {
throw new GroupedExamplesError();
if (areCategorized(examples)) {
throw new CategorizedExamplesError();
}

// TODO: This seems brittle. If the examples change this will fail at runtime.
Expand Down
8 changes: 4 additions & 4 deletions ui/src/demos/sentiment-analysis/Usage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

import React from 'react';
import { Models, Examples } from '@allenai/tugboat/context';
import { NoSelectedModelError, GroupedExamplesError } from '@allenai/tugboat/error';
import { isGroupedExamples } from '@allenai/tugboat/lib';
import { NoSelectedModelError, CategorizedExamplesError } from '@allenai/tugboat/error';
import { areCategorized } from '@allenai/tugboat/lib';

import { ModelUsage } from '../../components';

Expand All @@ -18,8 +18,8 @@ export const Usage = () => {
throw new NoSelectedModelError();
}

if (isGroupedExamples(examples)) {
throw new GroupedExamplesError();
if (areCategorized(examples)) {
throw new CategorizedExamplesError();
}

// TODO: This seems brittle. If the examples change this will fail at runtime.
Expand Down
8 changes: 4 additions & 4 deletions ui/src/demos/textual-entailment/Usage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

import React from 'react';
import { Models, Examples } from '@allenai/tugboat/context';
import { NoSelectedModelError, GroupedExamplesError } from '@allenai/tugboat/error';
import { isGroupedExamples } from '@allenai/tugboat/lib';
import { NoSelectedModelError, CategorizedExamplesError } from '@allenai/tugboat/error';
import { areCategorized } from '@allenai/tugboat/lib';

import { ModelUsage } from '../../components';

Expand All @@ -18,8 +18,8 @@ export const Usage = () => {
throw new NoSelectedModelError();
}

if (isGroupedExamples(examples)) {
throw new GroupedExamplesError();
if (areCategorized(examples)) {
throw new CategorizedExamplesError();
}

// TODO: This seems brittle. If the examples change this will fail at runtime.
Expand Down
8 changes: 4 additions & 4 deletions ui/src/demos/visual-question-answering/Usage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

import React from 'react';
import { Models, Examples } from '@allenai/tugboat/context';
import { NoSelectedModelError, GroupedExamplesError } from '@allenai/tugboat/error';
import { isGroupedExamples } from '@allenai/tugboat/lib';
import { NoSelectedModelError, CategorizedExamplesError } from '@allenai/tugboat/error';
import { areCategorized } from '@allenai/tugboat/lib';

import { ModelUsage } from '../../components';

Expand All @@ -18,8 +18,8 @@ export const Usage = () => {
throw new NoSelectedModelError();
}

if (isGroupedExamples(examples)) {
throw new GroupedExamplesError();
if (areCategorized(examples)) {
throw new CategorizedExamplesError();
}

// TODO: This seems brittle. If the examples change this will fail at runtime.
Expand Down
4 changes: 2 additions & 2 deletions ui/src/lib/TaskCard.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Example, GroupedExamples } from '@allenai/tugboat/lib';
import { Example, ExampleCategory } from '@allenai/tugboat/lib';

export interface TaskCard {
id: string;
Expand All @@ -7,7 +7,7 @@ export interface TaskCard {
expected_inputs?: string;
expected_outputs?: string;
scope_and_limitations?: string;
examples: Example[] | GroupedExamples;
examples: Example[] | ExampleCategory[];
}

export type TaskCardsById = { [taskId: string]: TaskCard };
Expand Down
8 changes: 4 additions & 4 deletions ui/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
resolved "https://registry.yarnpkg.com/@allenai/eslint-config-varnish/-/eslint-config-varnish-1.0.3.tgz#943da78f3e681f32331c78d1a826400aa6731a6a"
integrity sha512-/dnXAKJOwhbQbTp17CdeXyRiCUriy576cLGcE3zJmU5R+U5kNDycWDnMJttnrb+/cpKy4Ji4yvzDiISKk3TscA==

"@allenai/tugboat@^1.0.7":
version "1.0.7"
resolved "https://registry.yarnpkg.com/@allenai/tugboat/-/tugboat-1.0.7.tgz#a5a2c3fa9b9e79c7d86b0bbd590ae247af1426f0"
integrity sha512-99L0vL0SQ32HnmWu4JMzZkKVe6zZKs7+l7mP6hff7H/lt9XB/n7og63aNJL7FWorgMn/Ohb83Gqhs+Gmb0pGiQ==
"@allenai/tugboat@2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@allenai/tugboat/-/tugboat-2.0.0.tgz#8a56fe1683f6b0c3cbf272cbc13d9002d04addc6"
integrity sha512-V6F+Nrm3AOo9YMMy1HB1gJVqSFZ0pZCpyyvggN5Left1aMbPr5b0JZw3iObIgQEV+pRVJNpgAk9RyDDhkDnDUQ==
dependencies:
colormap "^2.3.1"
commonmark "^0.29.2"
Expand Down