From e088ef7e4ee55f83f6c34e1f08069221b3aaff21 Mon Sep 17 00:00:00 2001 From: Josako Date: Fri, 7 Mar 2025 15:06:51 +0100 Subject: [PATCH] - Remove embedding model from Catalog. We use Mistral's embedding. --- common/models/document.py | 2 -- eveai_app/views/document_forms.py | 5 ---- ...remove_embedding_model_from_catalog_we_.py | 29 +++++++++++++++++++ 3 files changed, 29 insertions(+), 7 deletions(-) create mode 100644 migrations/tenant/versions/ed981a641be9_remove_embedding_model_from_catalog_we_.py diff --git a/common/models/document.py b/common/models/document.py index 4fac7aa..3acf3cd 100644 --- a/common/models/document.py +++ b/common/models/document.py @@ -12,8 +12,6 @@ class Catalog(db.Model): description = db.Column(db.Text, nullable=True) type = db.Column(db.String(50), nullable=False, default="STANDARD_CATALOG") - embedding_model = db.Column(db.String(50), nullable=True) - min_chunk_size = db.Column(db.Integer, nullable=True, default=1500) max_chunk_size = db.Column(db.Integer, nullable=True, default=2500) diff --git a/eveai_app/views/document_forms.py b/eveai_app/views/document_forms.py index 8fe89f7..f54b833 100644 --- a/eveai_app/views/document_forms.py +++ b/eveai_app/views/document_forms.py @@ -32,8 +32,6 @@ class CatalogForm(FlaskForm): type = SelectField('Catalog Type', validators=[DataRequired()]) # Selection fields for processing & creating embeddings - embedding_model = SelectField('Embedding Model', choices=[], validators=[DataRequired()]) - min_chunk_size = IntegerField('Minimum Chunk Size (1500)', validators=[NumberRange(min=0), Optional()], default=1500) max_chunk_size = IntegerField('Maximum Chunk Size (2500)', validators=[NumberRange(min=0), Optional()], @@ -47,7 +45,6 @@ class CatalogForm(FlaskForm): super().__init__(*args, **kwargs) # Dynamically populate the 'type' field using the constructor self.type.choices = [(key, value['name']) for key, value in CATALOG_TYPES.items()] - self.embedding_model.choices = [(model, model) for model in current_app.config['SUPPORTED_EMBEDDINGS']] class EditCatalogForm(DynamicFormBase): @@ -58,8 +55,6 @@ class EditCatalogForm(DynamicFormBase): type = StringField('Catalog Type', validators=[DataRequired()], render_kw={'readonly': True}) # Selection fields for processing & creating embeddings - embedding_model = StringField('Embedding Model', validators=[DataRequired()], render_kw={'readonly': True}) - min_chunk_size = IntegerField('Minimum Chunk Size (2000)', validators=[NumberRange(min=0), Optional()], default=2000) max_chunk_size = IntegerField('Maximum Chunk Size (3000)', validators=[NumberRange(min=0), Optional()], diff --git a/migrations/tenant/versions/ed981a641be9_remove_embedding_model_from_catalog_we_.py b/migrations/tenant/versions/ed981a641be9_remove_embedding_model_from_catalog_we_.py new file mode 100644 index 0000000..af61baf --- /dev/null +++ b/migrations/tenant/versions/ed981a641be9_remove_embedding_model_from_catalog_we_.py @@ -0,0 +1,29 @@ +"""Remove embedding model from Catalog - we use Mistral + +Revision ID: ed981a641be9 +Revises: 2b04e961eee4 +Create Date: 2025-03-07 14:02:49.027216 + +""" +from alembic import op +import sqlalchemy as sa +import pgvector + + +# revision identifiers, used by Alembic. +revision = 'ed981a641be9' +down_revision = '2b04e961eee4' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('catalog', 'embedding_model') + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('catalog', sa.Column('embedding_model', sa.VARCHAR(length=50), autoincrement=False, nullable=True)) + # ### end Alembic commands ###