Skip to content

Commit

Permalink
refactored docs
Browse files Browse the repository at this point in the history 
Signed-off-by: Miguel Brandão <555migalves555@gmail.com>
  • Loading branch information
@HolyMichael
HolyMichael committed Jul 24, 2023
1 parent 82dd2d4 commit 87acf8e
Show file tree
Hide file tree
Showing 6 changed files with 391 additions and 517 deletions.
159 changes: 2 additions & 157 deletions deepsearch/model/examples/dummy_nlp_annotator/README.MD
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
# DummyNlpAnnotator
## Introduction
This is an example dummy NLP kind annotator it supports text data and annotates entities.

## Running the Annotator
To run this example make sure you've installed the full environment including the optional installs provided in poetry

Expand All @@ -11,158 +8,6 @@ Then simply start the server with

python -m deepsearch.model.examples.dummy_nlp_annotator.main

## Simple Interaction with the Annotator

You can direcly access the API via a browser to the provided url on the console upon running the application, usually:

http://127.0.0.1:8000
This will take you to the landing page. Here you will likely find that you are not authenticated, however you can still check if the API is responsive by accessing the /health endpoint

http://127.0.0.1:8000/health
It will be easier to interact with the application via the provided documentation endpoint

http://127.0.0.1:8000/docs

## Security
By default, the API requires an API-key to be used with every request to most endpoints, this key is defined on:

deepsearch/model/examples/dummy_nlp_annotator/main.py
this API key must be provided on the authorization header, sample request headers to /:

{'host': '127.0.0.1:8000', 'connection': 'keep-alive', 'sec-ch-ua': '"Not.A/Brand";v="8", "Chromium";v="114", "Google Chrome";v="114"', 'accept': 'application/json', 'sec-ch-ua-mobile': '?0', 'authorization': 'example123', 'user-agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36', 'sec-ch-ua-platform': '"Linux"', 'sec-fetch-site': 'same-origin', 'sec-fetch-mode': 'cors', 'sec-fetch-dest': 'empty', 'referer': 'http://127.0.0.1:8000/docs', 'accept-encoding': 'gzip, deflate, br', 'accept-language': 'en-US,en;q=0.9'}

## Advanced Interaction with the Annotator
On the /docs endpoint after inserting the api key you may see the following information about the API server

on endpoint:

- / - A list of all the annotators hosted on this server, in this example you will find only "DummyNLPAnnotator" on each annotator you will find its annotation capabilities as well as the kind of annotator it is (NLPAnnotator) which in turn tells you how to make requests to the annotator
- /model/{model_name} - You will find the annotation capabilities for the given annotator as well as it's kind.
- /model/{model_name}/predict - You can make POST requests to have the model annotate your data, refer to [Sample Requests](#Sample-Requests)

## Sample Requests

```python
{
"apiVersion": "string",
"kind": "NLPModel",
"metadata": {
"annotations": {
"deepsearch.res.ibm.com/x-deadline": "2038-01-18T00:00:00.000Z",
"deepsearch.res.ibm.com/x-transaction-id": "string",
"deepsearch.res.ibm.com/x-attempt-number": "string",
"deepsearch.res.ibm.com/x-max-attempts": "string"
}
},
"spec": {
"findEntities": {
"entityNames": ["entity_foo", "entity_bar"],
"objectType": "text",
"texts": [
"A piece of text",
"Yet another piece of text"
]
}
}
}
```

- You may alter entityNames to have any number of the entity types the annotator declares it can annotate, or an empty list to annotate all.
- This annotator has declared that it can only annotate text, as such the objectType must be text
- texts may be as long or as short as you need it.
- The x-deadline must lie some time in the future
- This annotator has declared that it is of kind NLPModel as such the kind for the request must match
- refer to the /docs for details on the NLPRequest type

Will result in the following output:
## Interaction with the Annotator

```python
{
"entities":[
{
"entity_foo":[
{
"type":"entity_foo",
"match":"a 'entity_foo' match in 'A piece of text'",
"original":"a 'entity_foo' original in 'A piece of text'",
"range":[
1,
5
]
},
{
"type":"entity_foo",
"match":"another 'entity_foo' match in 'A piece of text'",
"original":"another 'entity_foo' original in 'A piece of text'",
"range":[
12,
42
]
}
],
"entity_bar":[
{
"type":"entity_bar",
"match":"a 'entity_bar' match in 'A piece of text'",
"original":"a 'entity_bar' original in 'A piece of text'",
"range":[
1,
5
]
},
{
"type":"entity_bar",
"match":"another 'entity_bar' match in 'A piece of text'",
"original":"another 'entity_bar' original in 'A piece of text'",
"range":[
12,
42
]
}
]
},
{
"entity_foo":[
{
"type":"entity_foo",
"match":"a 'entity_foo' match in 'Yet another piece of text'",
"original":"a 'entity_foo' original in 'Yet another piece of text'",
"range":[
1,
5
]
},
{
"type":"entity_foo",
"match":"another 'entity_foo' match in 'Yet another piece of text'",
"original":"another 'entity_foo' original in 'Yet another piece of text'",
"range":[
12,
42
]
}
],
"entity_bar":[
{
"type":"entity_bar",
"match":"a 'entity_bar' match in 'Yet another piece of text'",
"original":"a 'entity_bar' original in 'Yet another piece of text'",
"range":[
1,
5
]
},
{
"type":"entity_bar",
"match":"another 'entity_bar' match in 'Yet another piece of text'",
"original":"another 'entity_bar' original in 'Yet another piece of text'",
"range":[
12,
42
]
}
]
}
]
}
```
refer to [https://ds4sd.github.io/deepsearch-toolkit/guide/](https://ds4sd.github.io/deepsearch-toolkit/guide/model/)
66 changes: 2 additions & 64 deletions deepsearch/model/examples/dummy_qa_generator/README.MD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,68 +11,6 @@ Then simply start the server with

python -m deepsearch.model.examples.dummy_qa_generator.main

## Simple Interaction with the Annotator
## Interaction with the Annotator

You can direcly access the API via a browser to the provided url on the console upon running the application, usually:

http://127.0.0.1:8000
This will take you to the landing page. Here you will likely find that you are not authenticated, however you can still check if the API is responsive by accessing the /health endpoint

http://127.0.0.1:8000/health
It will be easier to interact with the application via the provided documentation endpoint

http://127.0.0.1:8000/docs

## Security
By default, the API requires an API-key to be used with every request to most endpoints, this key is defined on:

deepsearch/model/examples/dummy_qa_generator/main.py
this API key must be provided on the authorization header, sample request headers to /:

{'host': '127.0.0.1:8000', 'connection': 'keep-alive', 'sec-ch-ua': '"Not.A/Brand";v="8", "Chromium";v="114", "Google Chrome";v="114"', 'accept': 'application/json', 'sec-ch-ua-mobile': '?0', 'authorization': 'example123', 'user-agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36', 'sec-ch-ua-platform': '"Linux"', 'sec-fetch-site': 'same-origin', 'sec-fetch-mode': 'cors', 'sec-fetch-dest': 'empty', 'referer': 'http://127.0.0.1:8000/docs', 'accept-encoding': 'gzip, deflate, br', 'accept-language': 'en-US,en;q=0.9'}

## Advanced Interaction with the Annotator
On the /docs endpoint after inserting the api key you may see the following information about the API server

on endpoint:

- / - A list of all the annotators hosted on this server, in this example you will find only "DummyQAGenerator" on each annotator you will find its annotation capabilities as well as the kind of annotator it is (QAGenModel) which in turn tells you how to make requests to the annotator
- /model/{model_name} - You will find the annotation capabilities for the given annotator as well as it's kind.
- /model/{model_name}/predict - You can make POST requests to have the model generate your data, refer to [Sample Requests](#Sample-Requests)

## Sample Requests

```python
{
"apiVersion": "string",
"kind": "QAGenModel",
"metadata": {
"annotations": {
"deepsearch.res.ibm.com/x-deadline": "2038-01-18T00:00:00.000Z",
"deepsearch.res.ibm.com/x-transaction-id": "string",
"deepsearch.res.ibm.com/x-attempt-number": "string",
"deepsearch.res.ibm.com/x-max-attempts": "string"
}
},
"spec": {
"generateAnswers": {
"contexts": [
["What is the best model"]
],
"questions": [
"If you are a dummy repeat what I said!"
]
}
}
}
```

Will result in the following output:

```python
{
"answers": [
"If you are a dummy repeat what I said!"
]
}
```
refer to [https://ds4sd.github.io/deepsearch-toolkit/guide/](https://ds4sd.github.io/deepsearch-toolkit/guide/model/)
Loading

0 comments on commit 87acf8e

Please sign in to comment.