mirror of
				https://github.com/explosion/spaCy.git
				synced 2025-11-04 01:48:04 +03:00 
			
		
		
		
	Support removing extra values in fill-config (#5966)
* Support removing extra values in fill-config * Fix test
This commit is contained in:
		
							parent
							
								
									f232d8db96
								
							
						
					
					
						commit
						e12b03358b
					
				| 
						 | 
				
			
			@ -6,7 +6,7 @@ requires = [
 | 
			
		|||
    "cymem>=2.0.2,<2.1.0",
 | 
			
		||||
    "preshed>=3.0.2,<3.1.0",
 | 
			
		||||
    "murmurhash>=0.28.0,<1.1.0",
 | 
			
		||||
    "thinc>=8.0.0a29,<8.0.0a40",
 | 
			
		||||
    "thinc>=8.0.0a30,<8.0.0a40",
 | 
			
		||||
    "blis>=0.4.0,<0.5.0",
 | 
			
		||||
    "pytokenizations",
 | 
			
		||||
    "pathy"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
# Our libraries
 | 
			
		||||
cymem>=2.0.2,<2.1.0
 | 
			
		||||
preshed>=3.0.2,<3.1.0
 | 
			
		||||
thinc>=8.0.0a29,<8.0.0a40
 | 
			
		||||
thinc>=8.0.0a30,<8.0.0a40
 | 
			
		||||
blis>=0.4.0,<0.5.0
 | 
			
		||||
ml_datasets>=0.1.1
 | 
			
		||||
murmurhash>=0.28.0,<1.1.0
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -34,13 +34,13 @@ setup_requires =
 | 
			
		|||
    cymem>=2.0.2,<2.1.0
 | 
			
		||||
    preshed>=3.0.2,<3.1.0
 | 
			
		||||
    murmurhash>=0.28.0,<1.1.0
 | 
			
		||||
    thinc>=8.0.0a29,<8.0.0a40
 | 
			
		||||
    thinc>=8.0.0a30,<8.0.0a40
 | 
			
		||||
install_requires =
 | 
			
		||||
    # Our libraries
 | 
			
		||||
    murmurhash>=0.28.0,<1.1.0
 | 
			
		||||
    cymem>=2.0.2,<2.1.0
 | 
			
		||||
    preshed>=3.0.2,<3.1.0
 | 
			
		||||
    thinc>=8.0.0a29,<8.0.0a40
 | 
			
		||||
    thinc>=8.0.0a30,<8.0.0a40
 | 
			
		||||
    blis>=0.4.0,<0.5.0
 | 
			
		||||
    wasabi>=0.7.1,<1.1.0
 | 
			
		||||
    srsly>=2.1.0,<3.0.0
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -70,7 +70,10 @@ def fill_config(
 | 
			
		|||
    msg = Printer(no_print=is_stdout)
 | 
			
		||||
    with show_validation_error(hint_fill=False):
 | 
			
		||||
        config = util.load_config(base_path)
 | 
			
		||||
        nlp, _ = util.load_model_from_config(config, auto_fill=True)
 | 
			
		||||
        nlp, _ = util.load_model_from_config(config, auto_fill=True, validate=False)
 | 
			
		||||
    # Load a second time with validation to be extra sure that the produced
 | 
			
		||||
    # config result is a valid config
 | 
			
		||||
    nlp, _ = util.load_model_from_config(nlp.config)
 | 
			
		||||
    filled = nlp.config
 | 
			
		||||
    if pretraining:
 | 
			
		||||
        validate_config_for_pretrain(filled, msg)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -313,3 +313,13 @@ def test_config_optional_sections():
 | 
			
		|||
    # also how Config.interpolate works under the hood.
 | 
			
		||||
    new_config = Config().from_str(filled.to_str())
 | 
			
		||||
    assert new_config["pretraining"] == {}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def test_config_auto_fill_extra_fields():
 | 
			
		||||
    config = Config({"nlp": {"lang": "en"}, "training": {}})
 | 
			
		||||
    assert load_model_from_config(config, auto_fill=True)
 | 
			
		||||
    config = Config({"nlp": {"lang": "en"}, "training": {"extra": "hello"}})
 | 
			
		||||
    nlp, _ = load_model_from_config(config, auto_fill=True, validate=False)
 | 
			
		||||
    assert "extra" not in nlp.config["training"]
 | 
			
		||||
    # Make sure the config generated is valid
 | 
			
		||||
    load_model_from_config(nlp.config)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue
	
	Block a user