Skip to content

Commit 3cc59dc

Browse files
committed
Change package name to proc-factory, bump version to 1.8.1
1 parent e2d03c4 commit 3cc59dc

17 files changed

Lines changed: 30 additions & 27 deletions

File tree

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11

22
# Change Log
33

4+
## 1.8.1
5+
- Change the package name from `processing-factory` to `proc-factory`
6+
47
## 1.8.0
58
- Add a /metrics endpoint that returns the service version, lock state & jobs progress
69
- Add a docker HEALTHCHECK

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ build-whl:
2727
rm -rf pesto-cli/dist/
2828
cd pesto-cli && python3 setup.py bdist_wheel
2929
mkdir -p ~/.pesto/dist/
30-
cp -f pesto-cli/dist/processing_factory*.whl ~/.pesto/dist/
30+
cp -f pesto-cli/dist/proc_factory*.whl ~/.pesto/dist/
3131
rm -rf pesto-cli/build
3232

3333
install: uninstall build-whl
34-
$(PIP) install ~/.pesto/dist/processing_factory*.whl
34+
$(PIP) install ~/.pesto/dist/proc_factory*.whl
3535

3636
install-dev: uninstall
3737
cd pesto-cli && $(PIP) install -e .
@@ -44,7 +44,7 @@ clean:
4444
cd pesto-cli && rm -rf build dist *egg-info .eggs .pytest_cache
4545

4646
uninstall:
47-
$(PIP) uninstall processing-factory -y
47+
$(PIP) uninstall proc-factory -y
4848

4949
test:
5050
rm -rf /tmp/pesto/service-template-test

pesto-cli/docs/deploy_web_service.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ curl http://localhost:4000/api/v1/describe
3030

3131
!!! Example
3232
```json
33-
{"name":"algo-service","resources":{"cpu":4,"gpu":0,"ram":8},"title":"algo-service","description":"Pesto Template contains all the boilerplate you need to create a processing-factory project","asynchronous":false,"email":"pesto@airbus.com","organization":"pesto","family":"detection","version":"1.0.0.dev0","keywords":["detection"],"template":"object-detection","config":{"$schema":"http://json-schema.org/draft-06/schema#","description":"Geo Process API config schema for algo-service","properties":{"padding":{"description":"Padding / border needed to process the tile. 0 for no padding.","maximum":256,"minimum":0,"type":"number"},"zoom":{"description":"Zoom levels that can be processed","items":{"maximum":17,"minimum":1,"type":"number"},"minItems":1,"type":"array"}},"required":["zoom","padding"],"title":"tile-object-detection-config","type":"object"},"input":{"$schema":"http://json-schema.org/draft-06/schema#","title":"","type":"object","description":"Expected format","definition":{},"definitions":{"Image":{"$schema":"http://json-schema.org/draft-06/schema#","description":"Image to process : it can be an url or the raw bytes encoded in base64","type":"string"},"Images":{"items":{"$ref":"#/definitions/Image"},"type":"array"},"Metadata":{"type":"object"},"Metadatas":{"items":{"$ref":"#/definitions/Metadata"},"type":"array"},"Polygon":{"$schema":"http://json-schema.org/draft-06/schema#","description":"GeoJSON Polygon","properties":{"bbox":{"items":{"type":"number"},"minItems":4,"type":"array"},"coordinates":{"items":{"items":{"items":{"type":"number"},"minItems":2,"type":"array"},"minItems":4,"type":"array"},"type":"array"},"type":{"enum":["Polygon"],"type":"string"}},"required":["type","coordinates"],"title":"Polygon","type":"object"},"Polygons":{"items":{"$ref":"#/definitions/Polygon"},"type":"array"}},"properties":{"dict_parameter":{"$ref":"#/definitions/Metadata","description":"A dict parameter"},"image":{"$ref":"#/definitions/Image","description":"Input image"},"integer_parameter":{"description":"A (integer) number parameter","type":"integer"},"number_parameter":{"description":"A (floating point) number parameter","type":"number"},"object_parameter":{"description":"A dict parameter with more spec, of the form {'key':'value'}","properties":{"key":{"type":"string"}},"type":"object"},"string_parameter":{"description":"A string parameter","type":"string"}},"required":["image"]},"output":{"$schema":"http://json-schema.org/draft-06/schema#","title":"","type":"object","description":"Expected format","definition":{},"definitions":{"Image":{"$schema":"http://json-schema.org/draft-06/schema#","description":"Image to process : it can be an url or the raw bytes encoded in base64","type":"string"},"Images":{"items":{"$ref":"#/definitions/Image"},"type":"array"},"Metadata":{"type":"object"},"Metadatas":{"items":{"$ref":"#/definitions/Metadata"},"type":"array"},"Polygon":{"$schema":"http://json-schema.org/draft-06/schema#","description":"GeoJSON Polygon","properties":{"bbox":{"items":{"type":"number"},"minItems":4,"type":"array"},"coordinates":{"items":{"items":{"items":{"type":"number"},"minItems":2,"type":"array"},"minItems":4,"type":"array"},"type":"array"},"type":{"enum":["Polygon"],"type":"string"}},"required":["type","coordinates"],"title":"Polygon","type":"object"},"Polygons":{"items":{"$ref":"#/definitions/Polygon"},"type":"array"}},"properties":{"areas":{"$ref":"#/definitions/Polygons"},"dict_output":{"$ref":"#/definitions/Metadata"},"geojson":{"description":"A Geojson.FeatureCollection containing only Polygons as geometries","properties":{"features":{"items":{"$schema":"http://json-schema.org/draft-06/schema#","properties":{"geometry":{"$ref":"#/definitions/Polygon"},"properties":{"oneOf":[{"type":"null"},{"type":"object"}]},"type":{"enum":["Feature"],"type":"string"}},"required":["type","properties","geometry"],"title":"GeoJSON Feature","type":"object"},"type":"array"},"type":{"type":"string"}},"type":"object"},"image":{"$ref":"#/definitions/Image"},"image_list":{"$ref":"#/definitions/Images"},"integer_output":{"type":"integer"},"number_output":{"type":"number"},"string_output":{"type":"string"}}},"_links":{"self":{"relation":"Access to describe resource","href":"http://localhost:4000/api/v1/describe","type":"application/json","method":"GET"},"execution":{"relation":"Processing resource","href":"http://localhost:4000/api/v1/process","type":"Complex type, see output in describe content for more information","method":"POST"},"config":{"relation":"Processing configuration","href":"http://localhost:4000/api/v1/config","type":"application/json","method":"GET"},"version":{"relation":"Processing version","href":"http://localhost:4000/api/v1/version","type":"application/json","method":"GET"},"health":{"relation":"Processing health","href":"http://localhost:4000/api/v1/health","type":"text/plain","method":"GET"}}}
33+
{"name":"algo-service","resources":{"cpu":4,"gpu":0,"ram":8},"title":"algo-service","description":"Pesto Template contains all the boilerplate you need to create a proc-factory project","asynchronous":false,"email":"pesto@airbus.com","organization":"pesto","family":"detection","version":"1.0.0.dev0","keywords":["detection"],"template":"object-detection","config":{"$schema":"http://json-schema.org/draft-06/schema#","description":"Geo Process API config schema for algo-service","properties":{"padding":{"description":"Padding / border needed to process the tile. 0 for no padding.","maximum":256,"minimum":0,"type":"number"},"zoom":{"description":"Zoom levels that can be processed","items":{"maximum":17,"minimum":1,"type":"number"},"minItems":1,"type":"array"}},"required":["zoom","padding"],"title":"tile-object-detection-config","type":"object"},"input":{"$schema":"http://json-schema.org/draft-06/schema#","title":"","type":"object","description":"Expected format","definition":{},"definitions":{"Image":{"$schema":"http://json-schema.org/draft-06/schema#","description":"Image to process : it can be an url or the raw bytes encoded in base64","type":"string"},"Images":{"items":{"$ref":"#/definitions/Image"},"type":"array"},"Metadata":{"type":"object"},"Metadatas":{"items":{"$ref":"#/definitions/Metadata"},"type":"array"},"Polygon":{"$schema":"http://json-schema.org/draft-06/schema#","description":"GeoJSON Polygon","properties":{"bbox":{"items":{"type":"number"},"minItems":4,"type":"array"},"coordinates":{"items":{"items":{"items":{"type":"number"},"minItems":2,"type":"array"},"minItems":4,"type":"array"},"type":"array"},"type":{"enum":["Polygon"],"type":"string"}},"required":["type","coordinates"],"title":"Polygon","type":"object"},"Polygons":{"items":{"$ref":"#/definitions/Polygon"},"type":"array"}},"properties":{"dict_parameter":{"$ref":"#/definitions/Metadata","description":"A dict parameter"},"image":{"$ref":"#/definitions/Image","description":"Input image"},"integer_parameter":{"description":"A (integer) number parameter","type":"integer"},"number_parameter":{"description":"A (floating point) number parameter","type":"number"},"object_parameter":{"description":"A dict parameter with more spec, of the form {'key':'value'}","properties":{"key":{"type":"string"}},"type":"object"},"string_parameter":{"description":"A string parameter","type":"string"}},"required":["image"]},"output":{"$schema":"http://json-schema.org/draft-06/schema#","title":"","type":"object","description":"Expected format","definition":{},"definitions":{"Image":{"$schema":"http://json-schema.org/draft-06/schema#","description":"Image to process : it can be an url or the raw bytes encoded in base64","type":"string"},"Images":{"items":{"$ref":"#/definitions/Image"},"type":"array"},"Metadata":{"type":"object"},"Metadatas":{"items":{"$ref":"#/definitions/Metadata"},"type":"array"},"Polygon":{"$schema":"http://json-schema.org/draft-06/schema#","description":"GeoJSON Polygon","properties":{"bbox":{"items":{"type":"number"},"minItems":4,"type":"array"},"coordinates":{"items":{"items":{"items":{"type":"number"},"minItems":2,"type":"array"},"minItems":4,"type":"array"},"type":"array"},"type":{"enum":["Polygon"],"type":"string"}},"required":["type","coordinates"],"title":"Polygon","type":"object"},"Polygons":{"items":{"$ref":"#/definitions/Polygon"},"type":"array"}},"properties":{"areas":{"$ref":"#/definitions/Polygons"},"dict_output":{"$ref":"#/definitions/Metadata"},"geojson":{"description":"A Geojson.FeatureCollection containing only Polygons as geometries","properties":{"features":{"items":{"$schema":"http://json-schema.org/draft-06/schema#","properties":{"geometry":{"$ref":"#/definitions/Polygon"},"properties":{"oneOf":[{"type":"null"},{"type":"object"}]},"type":{"enum":["Feature"],"type":"string"}},"required":["type","properties","geometry"],"title":"GeoJSON Feature","type":"object"},"type":"array"},"type":{"type":"string"}},"type":"object"},"image":{"$ref":"#/definitions/Image"},"image_list":{"$ref":"#/definitions/Images"},"integer_output":{"type":"integer"},"number_output":{"type":"number"},"string_output":{"type":"string"}}},"_links":{"self":{"relation":"Access to describe resource","href":"http://localhost:4000/api/v1/describe","type":"application/json","method":"GET"},"execution":{"relation":"Processing resource","href":"http://localhost:4000/api/v1/process","type":"Complex type, see output in describe content for more information","method":"POST"},"config":{"relation":"Processing configuration","href":"http://localhost:4000/api/v1/config","type":"application/json","method":"GET"},"version":{"relation":"Processing version","href":"http://localhost:4000/api/v1/version","type":"application/json","method":"GET"},"health":{"relation":"Processing health","href":"http://localhost:4000/api/v1/health","type":"text/plain","method":"GET"}}}
3434
```
3535

3636
### **health**
@@ -156,4 +156,4 @@ It should be "DONE"
156156
curl "http://localhost:4000/api/v1/jobs/{jobID}/results"
157157
```
158158

159-
It returns the result of the packaged algorithm
159+
It returns the result of the packaged algorithm

pesto-cli/docs/details_conventions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Here is a description of the paths where PESTO could write some files :
6262

6363
```
6464
pesto-cli build : $HOME/.pesto/service-name/x.y.z/
65-
pesto-cli build requirements (local cache): $HOME/.pesto/.processing-factory-requirements/
65+
pesto-cli build requirements (local cache): $HOME/.pesto/.proc-factory-requirements/
6666
pesto-ws async jobs files : $HOME/.pesto/.processing/jobs/${job_id}/
6767
pesto-template (unit testing) : /tmp/pesto/test
6868
```

pesto-cli/docs/get_started.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ First, install PESTO-CLI in your environment as follows:
2222
=== "Pypi"
2323

2424
```bash
25-
$ pip install processing-factory
25+
$ pip install proc-factory
2626
```
2727

2828
=== "From source"
@@ -98,7 +98,7 @@ maintainer_fullname [pesto]:
9898
maintainer_email [pesto@airbus.com]:
9999
project_name [algo-service]:
100100
project_sname [algo-service]:
101-
project_short_description [Pesto Template contains all the boilerplate you need to create a processing-factory project]:
101+
project_short_description [Pesto Template contains all the boilerplate you need to create a proc-factory project]:
102102
project_version [1.0.0.dev0]:
103103
104104
Service generated at /tmp/pesto/algo-service

pesto-cli/docs/package_configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ We then use [JSON schema](https://json-schema.org/) to validate input payloads.
250250

251251
The `json` files contain the input/output variables name and their information (`type`/`$ref`, `description`)
252252

253-
Default PESTO types can be found in the source code : `processing-factory/pesto-cli/pesto/cli/resources/schema/definitions.json`
253+
Default PESTO types can be found in the source code : `proc-factory/pesto-cli/pesto/cli/resources/schema/definitions.json`
254254

255255
## Requirements
256256

pesto-cli/docs/package_pesto_project.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ maintainer_fullname [pesto]:
2727
maintainer_email [pesto@airbus.com]:
2828
project_name [algo-service]:
2929
project_sname [algo-service]:
30-
project_short_description [Pesto Template contains all the boilerplate you need to create a processing-factory project]:
30+
project_short_description [Pesto Template contains all the boilerplate you need to create a proc-factory project]:
3131
project_version [1.0.0.dev0]:
3232
3333
Service generated at /path/to/your/workspace/algo-service

pesto-cli/docs/pesto_init.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ maintainer_fullname [pesto]:
2727
maintainer_email [pesto@airbus.com]:
2828
project_name [algo-service]: xxx-service
2929
project_sname [algo-service]: xxx-service
30-
project_short_description [Pesto Template contains all the boilerplate you need to create a processing-factory project]:
30+
project_short_description [Pesto Template contains all the boilerplate you need to create a proc-factory project]:
3131
project_version [1.0.0.dev0]:
3232
3333
Service generated at /path/to/your/workspace/xxx-service
@@ -75,7 +75,7 @@ If you have many project sharing some information (your company, email, requirem
7575
- Copy the default template to a new place for your own template :
7676

7777
```bash
78-
$ pip show processing-factory | grep Location | awk '{print $NF}' > /tmp/pesto_site_packages.txt
78+
$ pip show proc-factory | grep Location | awk '{print $NF}' > /tmp/pesto_site_packages.txt
7979
$ cp -r `cat /tmp/pesto_site_packages.txt`/pesto_cli/resources/pesto-template /path/to/my_pesto_template
8080
```
8181

pesto-cli/docs/tutorial_pytorch.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ First, ensure you have PESTO installed in a python 3.6+ environment. Typically,
2727
To install PESTO with pip (see [Get Started](get_started.md)):
2828

2929
```bash
30-
$ pip install processing-factory
30+
$ pip install proc-factory
3131
```
3232

3333
## Create PESTO project
@@ -56,7 +56,7 @@ maintainer_fullname [pesto]: Computer Vision
5656
maintainer_email [pesto@airbus.com]: computervision@airbus.com
5757
project_name [algo-service]: pytorch-deployment-tutorial
5858
project_sname [pytorch-deployment-tutorial]:
59-
project_short_description [Pesto Template contains all the boilerplate you need to create a processing-factory project]: My first deployment with PESTO
59+
project_short_description [Pesto Template contains all the boilerplate you need to create a proc-factory project]: My first deployment with PESTO
6060
project_version [1.0.0.dev0]: 1.0.0
6161
[2022-12-13 17:44:24,345] 28731-INFO app::init():l44:
6262
Service generated at /tmp/pesto/pytorch-deployment-tutorial

pesto-cli/integrationtests/tests-all.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
sname = "algo-service"
2222
version = "1.0.0.dev0"
2323
image_name = "{}:{}".format(sname, version)
24-
description = "Pesto Template contains all the boilerplate you need to create a processing-factory project"
24+
description = "Pesto Template contains all the boilerplate you need to create a proc-factory project"
2525
organization = "pesto"
2626
licence = "Property of pesto, all rights reserved"
2727
email = "pesto@airbus.com"

0 commit comments

Comments
 (0)