🔧 chore(pyproject.toml): comment out langfuse dependency to temporarily disable it

🔧 chore(schemas.py): remove merge conflict markers from the file
🔧 chore(custom_component.py): remove merge conflict markers from the file
🔧 chore(flow.py): remove merge conflict markers from the file
🔧 chore(langfuse.py): add exception handling for ImportError when importing Langfuse
🔧 chore(auth.py): add type hinting to pwd_context variable
🔧 chore(base.py): remove merge conflict markers from the file
🔧 chore(settings.py): remove merge conflict markers from the file
🔧 chore(conftest.py): remove merge conflict markers from the file
🔧 chore(test_cli.py): remove merge conflict markers from the file
This commit is contained in:
Gabriel Luiz Freitas Almeida 2023-09-27 16:08:58 -03:00
commit 8c8b863b18
11 changed files with 790 additions and 499 deletions

View file

@ -26,10 +26,6 @@ def test_components_path(runner, client, default_settings):
["run", "--components-path", str(temp_dir), *default_settings],
)
assert result.exit_code == 0, result.stdout
<<<<<<< HEAD
settings_manager = utils.get_settings_manager()
assert str(temp_dir) in settings_manager.settings.COMPONENTS_PATH
=======
settings_service = getters.get_settings_service()
assert str(temp_dir) in settings_service.settings.COMPONENTS_PATH
@ -38,4 +34,3 @@ def test_superuser(runner, client, session):
result = runner.invoke(app, ["superuser"], input="admin\nadmin\n")
assert result.exit_code == 0, result.stdout
assert "Superuser created successfully." in result.stdout
>>>>>>> origin/dev