🔧 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

tests/conftest.py

@@ -165,12 +165,6 @@ def json_flow_with_prompt_and_history():
         return f.read()
 
 
-<<<<<<< HEAD
-@pytest.fixture(name="client", scope="function", autouse=True)
-def client_fixture(session: Session):
-    def get_session_override():
-        return session
-=======
 @pytest.fixture
 def json_vector_store():
     with open(pytest.VECTOR_STORE_PATH, "r") as f:
@@ -184,7 +178,6 @@ def client_fixture(session: Session, monkeypatch):
     db_path = Path(db_dir) / "test.db"
     monkeypatch.setenv("LANGFLOW_DATABASE_URL", f"sqlite:///{db_path}")
     monkeypatch.setenv("LANGFLOW_AUTO_LOGIN", "false")
->>>>>>> origin/dev
 
     from langflow.main import create_app
 

tests/test_cli.py

@@ -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