mirror of
				https://github.com/deepset-ai/haystack.git
				synced 2025-11-04 03:39:31 +00:00 
			
		
		
		
	* Remove BasePipeline and make a module for RayPipeline * Can load pipelines from yaml, plenty of issues left * Extract graph validation logic into _add_node_to_pipeline_graph & refactor load_from_config and add_node to use it * Fix pipeline tests * Move some tests out of test_pipeline.py and create MockDenseRetriever * myoy and pylint (silencing too-many-public-methods) * Fix issue found in some yaml files and in schema files * Fix paths to YAML and fix some typos in Ray * Fix eval tests * Simplify MockDenseRetriever * Fix Ray test * Accidentally pushed merge coinflict, fixed * Typo in schemas * Typo in _json_schema.py * Slightly reduce noisyness of version validation warnings * Fix version logs tests * Fix version logs tests again * remove seemingly unused file * Add check and test to avoid adding the same node to the pipeline twice * Update Documentation & Code Style * Revert config to pipeline_config * Remo0ve unused import * Complete reverting to pipeline_config * Some more stray config= * Update Documentation & Code Style * Feedback * Move back other_nodes tests into pipeline tests temporarily * Update Documentation & Code Style * Fixing tests * Update Documentation & Code Style * Fixing ray and standard pipeline tests * Rename colliding load() methods in dense retrievers and faiss * Update Documentation & Code Style * Fix mypy on ray.py as well * Add check for no root node * Fix tests to use load_from_directory and load_index * Try to workaround the disabled add_node of RayPipeline * Update Documentation & Code Style * Fix Ray test * Fix FAISS tests * Relax class check in _add_node_to_pipeline_graph * Update Documentation & Code Style * Try to fix mypy in ray.py * unused import * Try another fix for Ray * Fix connector tests * Update Documentation & Code Style * Fix ray * Update Documentation & Code Style * use BaseComponent.load() in pipelines/base.py * another round of feedback * stray BaseComponent.load() * Update Documentation & Code Style * Fix FAISS tests too Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: tstadel <60758086+tstadel@users.noreply.github.com>
		
			
				
	
	
		
			36 lines
		
	
	
		
			999 B
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			36 lines
		
	
	
		
			999 B
		
	
	
	
		
			Python
		
	
	
	
	
	
from pathlib import Path
 | 
						|
 | 
						|
import pytest
 | 
						|
import ray
 | 
						|
 | 
						|
from haystack.pipelines import RayPipeline
 | 
						|
 | 
						|
from .conftest import SAMPLES_PATH
 | 
						|
 | 
						|
 | 
						|
@pytest.fixture(autouse=True)
 | 
						|
def shutdown_ray():
 | 
						|
    yield
 | 
						|
    try:
 | 
						|
        import ray
 | 
						|
 | 
						|
        ray.shutdown()
 | 
						|
    except:
 | 
						|
        pass
 | 
						|
 | 
						|
 | 
						|
@pytest.mark.integration
 | 
						|
@pytest.mark.parametrize("document_store_with_docs", ["elasticsearch"], indirect=True)
 | 
						|
def test_load_pipeline(document_store_with_docs):
 | 
						|
    pipeline = RayPipeline.load_from_yaml(
 | 
						|
        SAMPLES_PATH / "pipeline" / "test_ray_pipeline.yaml",
 | 
						|
        pipeline_name="ray_query_pipeline",
 | 
						|
        ray_args={"num_cpus": 8},
 | 
						|
    )
 | 
						|
    prediction = pipeline.run(query="Who lives in Berlin?", params={"Retriever": {"top_k": 10}, "Reader": {"top_k": 3}})
 | 
						|
 | 
						|
    assert ray.serve.get_deployment(name="ESRetriever").num_replicas == 2
 | 
						|
    assert ray.serve.get_deployment(name="Reader").num_replicas == 1
 | 
						|
    assert prediction["query"] == "Who lives in Berlin?"
 | 
						|
    assert prediction["answers"][0].answer == "Carla"
 |