diff --git a/code/services-core/control-service/build.gradle b/code/services-core/control-service/build.gradle index 5460ca21b..4e2b6ddf6 100644 --- a/code/services-core/control-service/build.gradle +++ b/code/services-core/control-service/build.gradle @@ -32,6 +32,7 @@ dependencies { implementation project(':code:common:config') implementation project(':code:common:renderer') implementation project(':code:libraries:message-queue') + implementation project(':code:libraries:language-processing') implementation project(':code:functions:search-query:api') implementation project(':code:execution:api') implementation project(':code:index:api') diff --git a/code/services-core/control-service/java/nu/marginalia/control/ControlMain.java b/code/services-core/control-service/java/nu/marginalia/control/ControlMain.java index 8aa510b6e..508388017 100644 --- a/code/services-core/control-service/java/nu/marginalia/control/ControlMain.java +++ b/code/services-core/control-service/java/nu/marginalia/control/ControlMain.java @@ -4,6 +4,7 @@ import com.google.inject.Guice; import com.google.inject.Inject; import com.google.inject.Injector; import nu.marginalia.WmsaHome; +import nu.marginalia.language.config.LanguageConfiguration; import nu.marginalia.service.MainClass; import nu.marginalia.service.ServiceId; import nu.marginalia.service.discovery.ServiceRegistryIf; @@ -42,6 +43,9 @@ public class ControlMain extends MainClass { var registry = injector.getInstance(ServiceRegistryIf.class); var configuration = injector.getInstance(ServiceConfiguration.class); + // Ensures we download POS tag models from control svc at first boot + var languageConfig = injector.getInstance(LanguageConfiguration.class); + // This must be run before orchestrateBoot, so that the other services don't // start up until we're done downloadAncillaryFiles(WmsaHome.getDataPath()); diff --git a/run/setup.sh b/run/setup.sh index aeefd974e..6452e78ff 100755 --- a/run/setup.sh +++ b/run/setup.sh @@ -64,9 +64,6 @@ else mkdir -p {node-1,node-2}/{work,index,backup,samples/export,uploads} fi -download_model model/English.DICT https://raw.githubusercontent.com/datquocnguyen/RDRPOSTagger/e0fa60db14eae90b66dc67691f0f519eb19e3e66/Models/POS/English.DICT 356d96a8832b62eb5e0ddac6f0301ada -download_model model/English.RDR https://raw.githubusercontent.com/datquocnguyen/RDRPOSTagger/e0fa60db14eae90b66dc67691f0f519eb19e3e66/Models/POS/English.RDR bec40a1160e12c33a1dd0563677104e4 - download_model model/opennlp-sentence.bin https://archive.apache.org/dist/opennlp/models/ud-models-1.0/opennlp-en-ud-ewt-sentence-1.0-1.9.3.bin 5965ada99a2ca77beb8632bb47741b7a download_model model/segments.bin https://huggingface.co/MarginaliaNu/MarginaliaModelData/resolve/c9339e4224f1dfad7f628809c32687e748198ae3/segments.bin?download=true a2650796c77968b1bd9db0d7c01e3150