Skip to content

Commit

Permalink
Release chores (#74)
Browse files Browse the repository at this point in the history
  • Loading branch information
@prabhuomkar
prabhuomkar authored Jun 24, 2024
1 parent 946bd16 commit e16d4d1
Show file tree
Hide file tree
Showing 11 changed files with 50 additions and 45 deletions.
4 changes: 2 additions & 2 deletions api/config/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ type (
Faces bool `envconfig:"SMRITI_ML_FACES" default:"true"`
PlacesProvider string `envconfig:"SMRITI_ML_PLACES_PROVIDER" default:"openstreetmap"`
ClassificationProvider string `envconfig:"SMRITI_ML_CLASSIFICATION_PROVIDER" default:"pytorch"`
ClassificationParams string `envconfig:"SMRITI_ML_CLASSIFICATION_PARAMS" default:"{\"file\":\"classification_v240615.pt\"}"`
ClassificationParams string `envconfig:"SMRITI_ML_CLASSIFICATION_PARAMS" default:"{\"file\":\"classification_v240624.pt\"}"`
OCRProvider string `envconfig:"SMRITI_ML_OCR_PROVIDER" default:"paddlepaddle"`
OCRParams string `envconfig:"SMRITI_ML_OCR_PARAMS" default:"{\"det_model_dir\":\"det_onnx\",\"rec_model_dir\":\"rec_onnx\",\"cls_model_dir\":\"cls_onnx\"}"`
SearchProvider string `envconfig:"SMRITI_ML_SEARCH_PROVIDER" default:"pytorch"`
SearchParams string `envconfig:"SMRITI_ML_SEARCH_PARAMS" default:"{\"tokenizer_dir\":\"search_tokenizer\",\"processor_dir\":\"search_processor\",\"text_file\":\"search_text_v240615.pt\",\"vision_file\":\"search_vision_v240615.pt\"}"` //nolint:lll
SearchParams string `envconfig:"SMRITI_ML_SEARCH_PARAMS" default:"{\"tokenizer_dir\":\"search_tokenizer\",\"processor_dir\":\"search_processor\",\"text_file\":\"search_text_v240624.pt\",\"vision_file\":\"search_vision_v240624.pt\"}"` //nolint:lll
FacesProvider string `envconfig:"SMRITI_ML_FACES_PROVIDER" default:"pytorch"`
FacesParams string `envconfig:"SMRITI_ML_FACES_PARAMS" default:"{\"minutes\":\"1\",\"face_threshold\":\"0.9\",\"model\":\"vggface2\",\"clustering\":\"annoy\"}"`
PreviewThumbnailParams string `envconfig:"SMRITI_ML_PREVIEW_THUMBNAIL_PARAMS" default:"{\"thumbnail_size\":\"512\"}"`
Expand Down
2 changes: 1 addition & 1 deletion api/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ require (
github.com/kelseyhightower/envconfig v1.4.0
github.com/labstack/echo-contrib v0.17.1
github.com/labstack/echo/v4 v4.12.0
github.com/minio/minio-go/v7 v7.0.71
github.com/minio/minio-go/v7 v7.0.72
github.com/pgvector/pgvector-go v0.1.1
github.com/prometheus/client_golang v1.19.1
github.com/satori/go.uuid v1.2.0
Expand Down
4 changes: 2 additions & 2 deletions api/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
github.com/minio/minio-go/v7 v7.0.71 h1:No9XfOKTYi6i0GnBj+WZwD8WP5GZfL7n7GOjRqCdAjA=
github.com/minio/minio-go/v7 v7.0.71/go.mod h1:4yBA8v80xGA30cfM3fz0DKYMXunWl/AV/6tWEs9ryzo=
github.com/minio/minio-go/v7 v7.0.72 h1:ZSbxs2BfJensLyHdVOgHv+pfmvxYraaUy07ER04dWnA=
github.com/minio/minio-go/v7 v7.0.72/go.mod h1:4yBA8v80xGA30cfM3fz0DKYMXunWl/AV/6tWEs9ryzo=
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/user-guide/features/search.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Enable this feature using API Configuration:
```bash
SMRITI_ML_SEARCH: true
SMRITI_ML_SEARCH_PROVIDER: pytorch
SMRITI_ML_SEARCH_PARAMS: {"tokenizer_dir":"search_tokenizer","processor_dir":"search_processor","text_file":"search_text_v240615.pt","vision_file":"search_vision_v240615.pt"}
SMRITI_ML_SEARCH_PARAMS: {"tokenizer_dir":"search_tokenizer","processor_dir":"search_processor","text_file":"search_text_v240624.pt","vision_file":"search_vision_v240624.pt"}
```

## Use Cases
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/user-guide/features/things.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Enable this feature using API Configuration:
SMRITI_FEATURE_THINGS: true
SMRITI_ML_CLASSIFICATION: true
SMRITI_ML_CLASSIFICATION_PROVIDER: pytorch
SMRITI_ML_CLASSIFICATION_PARAMS: {"file":"classification_v240615.pt"}
SMRITI_ML_CLASSIFICATION_PARAMS: {"file":"classification_v240624.pt"}
```

## Use Cases
Expand Down
65 changes: 35 additions & 30 deletions docs/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "smriti",
"version": "24.06.15",
"version": "24.06.24",
"private": true,
"scripts": {
"docusaurus": "docusaurus",
Expand Down
4 changes: 2 additions & 2 deletions docs/swagger.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ openapi: 3.0.3
info:
title: Smriti API
description: Smarter Home for all your Photos and Videos
version: 24.06.15
version: 24.06.24
servers:
- url: https://localhost:5001
tags:
Expand Down Expand Up @@ -1460,7 +1460,7 @@ components:
properties:
version:
type: string
example: 24.06.15
example: 24.06.24
gitSha:
type: string
example: addf120b430021c36c232c99ef8d926aea2acd6b
Expand Down
4 changes: 2 additions & 2 deletions ml/requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ paddlepaddle==2.6.1
rapidocr-onnxruntime==1.3.22
setuptools==70.0.0
six==1.16.0
torch==2.3.0
torchvision==0.18.0
torch==2.3.1
torchvision==0.18.1
transformers==4.41.2
urllib3==2.2.2
4 changes: 2 additions & 2 deletions worker/requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ rapidocr-onnxruntime==1.3.22
rawpy==0.21.0
requests==2.32.3
schedule==1.2.2
torch==2.3.0
torchvision==0.18.0
torch==2.3.1
torchvision==0.18.1
transformers==4.41.2
Wand==0.6.13
2 changes: 1 addition & 1 deletion worker/src/main.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ async def serve() -> None: # pylint: disable=too-many-locals
components.append(Finalize(api_stub=api_stub))

# initialize worker grpc server
grpc_server = grpc.aio.server()
grpc_server = grpc.aio.server(maximum_concurrent_rpcs=int(os.getenv('SMRITI_WORKER_CONCURRENT_RPCS', '5')))
add_WorkerServicer_to_server(WorkerService(components, search_model), grpc_server)
port = int(os.getenv('SMRITI_WORKER_PORT', '15002'))
grpc_server.add_insecure_port(f'[::]:{port}')
Expand Down

0 comments on commit e16d4d1

Please sign in to comment.