From 2d3e00745e07db3464ef355abd9a93dbb2d79f7d Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Wed, 24 Sep 2025 15:44:47 +0200 Subject: [PATCH] seperate user and public models more clearly --- app/blueprints/services/forms.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/blueprints/services/forms.py b/app/blueprints/services/forms.py index 57258c31..acda687d 100644 --- a/app/blueprints/services/forms.py +++ b/app/blueprints/services/forms.py @@ -87,14 +87,14 @@ class CreateTesseractOCRPipelineJobForm(CreateJobBaseForm): user_models = [ x for x in current_user.tesseract_ocr_pipeline_models.order_by(TesseractOCRPipelineModel.title).all() ] - models = [ + public_models = [ x for x in TesseractOCRPipelineModel.query.order_by(TesseractOCRPipelineModel.title).all() - if version in x.compatible_service_versions and (x.is_public == True or x.user == current_user) + if version in x.compatible_service_versions and x.is_public == True ] self.model.choices = { '': [('', 'Choose your option')], 'Your models': [(x.hashid, f'{x.title} [{x.version}]') for x in user_models] if user_models else [(0, 'Nothing here yet...')], - 'Public models': [(x.hashid, f'{x.title} [{x.version}]') for x in models] + 'Public models': [(x.hashid, f'{x.title} [{x.version}]') for x in public_models] } self.model.default = '' self.version.choices = [(x, x) for x in service_manifest['versions']] @@ -176,14 +176,14 @@ class CreateSpacyNLPPipelineJobForm(CreateJobBaseForm): user_models = [ x for x in current_user.spacy_nlp_pipeline_models.order_by(SpaCyNLPPipelineModel.title).all() ] - models = [ - x for x in SpaCyNLPPipelineModel.query.filter(SpaCyNLPPipelineModel.user != current_user, SpaCyNLPPipelineModel.is_public == True).order_by(SpaCyNLPPipelineModel.title).all() - if version in x.compatible_service_versions + public_models = [ + x for x in SpaCyNLPPipelineModel.query.order_by(SpaCyNLPPipelineModel.title).all() + if version in x.compatible_service_versions and x.is_public == True ] self.model.choices = { '': [('', 'Choose your option')], 'Your models': [(x.hashid, f'{x.title} [{x.version}]') for x in user_models] if user_models else [(0, 'Nothing here yet...')], - 'Public models': [(x.hashid, f'{x.title} [{x.version}]') for x in models] + 'Public models': [(x.hashid, f'{x.title} [{x.version}]') for x in public_models] } self.model.default = '' self.version.choices = [(x, x) for x in service_manifest['versions']]