Skip to content

Commit

Permalink
Merge pull request #352 from Capsize-Games/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
w4ffl35 authored Jan 9, 2024
2 parents 290a82a + 99f0db3 commit d389d0e
Show file tree
Hide file tree
Showing 22 changed files with 1,213 additions and 1,384 deletions.
4 changes: 2 additions & 2 deletions src/airunner/aihandler/llm.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import traceback

from airunner.aihandler.transformer_runner import TransformerRunner
from airunner.aihandler.logger import Logger as logger
from airunner.aihandler.logger import Logger
from airunner.aihandler.enums import MessageCode
import os
from jinja2 import Environment, FileSystemLoader
Expand Down Expand Up @@ -143,5 +143,5 @@ def generate(self):
answers.append(answer.strip().lower())
return answers
else:
logger.error(f"Failed to call generator for {self.generator.name}")
Logger.error(f"Failed to call generator for {self.generator.name}")
# self.llm_api.request(**kwargs)
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
"""Adds ai_mode to settings
Revision ID: 55c1dff62eba
Revises: 08728ca819b8
Create Date: 2024-01-09 03:43:41.928457
"""
from typing import Sequence, Union

from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision: str = '55c1dff62eba'
down_revision: Union[str, None] = '08728ca819b8'
branch_labels: Union[str, Sequence[str], None] = None
depends_on: Union[str, Sequence[str], None] = None


def upgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
op.add_column('settings', sa.Column('ai_mode', sa.Boolean(), nullable=True))
# ### end Alembic commands ###


def downgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
op.drop_column('settings', 'ai_mode')
# ### end Alembic commands ###
2 changes: 1 addition & 1 deletion src/airunner/data/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -660,8 +660,8 @@ class Settings(BaseModel):
enable_advanced_mode = Column(Boolean, default=False)

enable_tts = Column(Boolean, default=True)

generator_settings_override_id = Column(Integer, ForeignKey('generator_settings.id'))
ai_mode = Column(Boolean, default=True)


class StandardImageWidgetSettings(BaseModel):
Expand Down
7 changes: 0 additions & 7 deletions src/airunner/tests/test_get_latest_version.py

This file was deleted.

1 change: 1 addition & 0 deletions src/airunner/widgets/canvas_plus/standard_image_widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
from airunner.widgets.slider.slider_widget import SliderWidget
from airunner.data.models import ActionScheduler, Pipeline, GeneratorSetting


class StandardImageWidget(StandardBaseWidget):
widget_class_ = Ui_standard_image_widget
_pixmap = None
Expand Down
Loading

0 comments on commit d389d0e

Please sign in to comment.