From 54c11406dc074c1e141f5a7cadcaf812e8354eb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eetu=20M=C3=A4kel=C3=A4?= Date: Fri, 24 Jan 2014 23:24:34 +0200 Subject: [PATCH] first commit --- .gitignore | 23 + README.md | 5 + app/Application.scala | 10 + app/Global.scala | 11 + app/assets/javascripts/index.coffee | 92 ++++ app/assets/javascripts/playroutes.js | 58 +++ app/assets/stylesheets/index.less | 14 + app/binders/Binders.scala | 15 + .../LexicalAnalysisController.scala | 407 ++++++++++++++++++ .../LexicalAnalysisModule.scala | 34 ++ app/views/assetMode.scala | 21 + app/views/index.scala.html | 269 ++++++++++++ build.sbt | 30 ++ conf/application.conf | 70 +++ conf/routes | 31 ++ project/build.properties | 4 + project/plugins.sbt | 12 + public/images/secologo-small.png | Bin 0 -> 1140 bytes public/images/secologo.png | Bin 0 -> 5393 bytes 19 files changed, 1106 insertions(+) create mode 100644 .gitignore create mode 100644 README.md create mode 100644 app/Application.scala create mode 100644 app/Global.scala create mode 100644 app/assets/javascripts/index.coffee create mode 100644 app/assets/javascripts/playroutes.js create mode 100644 app/assets/stylesheets/index.less create mode 100644 app/binders/Binders.scala create mode 100644 app/controllers/LexicalAnalysisController.scala create mode 100644 app/services/lexicalanalysis/LexicalAnalysisModule.scala create mode 100644 app/views/assetMode.scala create mode 100644 app/views/index.scala.html create mode 100644 build.sbt create mode 100644 conf/application.conf create mode 100644 conf/routes create mode 100644 project/build.properties create mode 100644 project/plugins.sbt create mode 100644 public/images/secologo-small.png create mode 100644 public/images/secologo.png diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7ddd4b8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +logs +project/project +project/target +target +/.target +/.ensime +/.cache +tmp +.history +dist +/.idea +/*.iml +/out +/.idea_modules +/.classpath +/.project +/RUNNING_PID +/.settings +/project/*-shim.sbt +activator.bat +activator +activator-launch-*.jar +activator-*-shim.sbt diff --git a/README.md b/README.md new file mode 100644 index 0000000..944f392 --- /dev/null +++ b/README.md @@ -0,0 +1,5 @@ +seco-lexicalanalysis-play +========================= + +SeCo lexical analysis services published as a web service using the Scala Play framework. + diff --git a/app/Application.scala b/app/Application.scala new file mode 100644 index 0000000..ce6edf1 --- /dev/null +++ b/app/Application.scala @@ -0,0 +1,10 @@ +import controllers.LexicalAnalysisController + +import com.softwaremill.macwire.MacwireMacros._ +import services.lexicalanalysis.LexicalAnalysisModule + +object Application extends LexicalAnalysisModule { + + val lexicalAnalysisController = wire[LexicalAnalysisController] + +} diff --git a/app/Global.scala b/app/Global.scala new file mode 100644 index 0000000..285e6e7 --- /dev/null +++ b/app/Global.scala @@ -0,0 +1,11 @@ +import com.softwaremill.macwire.{InstanceLookup, Macwire} +import java.util.Locale +import play.api.GlobalSettings +import play.api.mvc.QueryStringBindable.Parsing + +object Global extends GlobalSettings with Macwire { + val instanceLookup = InstanceLookup(valsByClass(Application)) + + override def getControllerInstance[A](controllerClass: Class[A]) = instanceLookup.lookupSingleOrThrow(controllerClass) + +} diff --git a/app/assets/javascripts/index.coffee b/app/assets/javascripts/index.coffee new file mode 100644 index 0000000..31d1965 --- /dev/null +++ b/app/assets/javascripts/index.coffee @@ -0,0 +1,92 @@ +'use strict' + +angular.module('index',['play.routing']) + .controller('IdentifyCtrl', ($scope, playRoutes) -> + $scope.text = "The quick brown fox jumps over the lazy dog" + $scope.$watch('text', _.throttle((text) -> + playRoutes.controllers.LexicalAnalysisController.identifyGET(text).get().success((data) -> + $scope.errorStatus = '' + $scope.guessedLang=data + ).error((data,status) -> + if (status==0) + $scope.errorStatus = 503 + $scope.error = "Service unavailable" + else + $scope.errorStatus = status + $scope.error = data + ) + ,1000)) + ) + .controller('LemmatizeCtrl', ($scope, playRoutes) -> + $scope.text = "Albert osti fagotin ja töräytti puhkuvan melodian." + $scope.$watchCollection('[text,locale]', _.throttle(() -> + locale = $scope.locale + if locale=='' then locale=null + playRoutes.controllers.LexicalAnalysisController.baseformGET($scope.text,locale).get().success((data) -> + $scope.errorStatus = '' + $scope.baseform=data + ).error((data,status) -> + if (status==0) + $scope.errorStatus = 503 + $scope.error = "Service unavailable" + else + $scope.errorStatus = status + $scope.error = data + ) + ,1000)) + ) + .controller('AnalyzeCtrl', ($scope, playRoutes) -> + $scope.text = "Albert osti" + $scope.locale = "fi" + $scope.$watchCollection('[text,locale]', _.throttle(() -> + locale = $scope.locale + if locale=='' then locale=null + playRoutes.controllers.LexicalAnalysisController.analyzeGET($scope.text,locale).get().success((data) -> + $scope.analysis=data + ).error((data,status) -> + if (status==0) + $scope.errorStatus = 503 + $scope.error = "Service unavailable" + else + $scope.errorStatus = status + $scope.error = data + ) + ,1000)) + ) + .controller('InflectionCtrl', ($scope, playRoutes) -> + $scope.text = "Albert osti fagotin ja töräytti puhkuvan melodian." + $scope.locale = "fi" + $scope.baseform=true; + $scope.forms = "V N Nom Sg, N Nom Pl, A Pos Nom Pl" + $scope.$watchCollection('[text,locale,baseform,forms]', _.throttle(() -> + locale = $scope.locale + if locale=='' then locale=null + playRoutes.controllers.LexicalAnalysisController.inflectGET($scope.text, $scope.forms.split(/, */),$scope.baseform,locale).get().success((data) -> + $scope.inflection=data + ).error((data,status) -> + if (status==0) + $scope.errorStatus = 503 + $scope.error = "Service unavailable" + else + $scope.errorStatus = status + $scope.error = data + ) + ,1000)) + ) + .controller('HyphenationCtrl', ($scope, playRoutes) -> + $scope.text = "Albert osti fagotin ja töräytti puhkuvan melodian." + $scope.$watchCollection('[text,locale]', _.throttle(() -> + locale = $scope.locale + if locale=='' then locale=null + playRoutes.controllers.LexicalAnalysisController.hyphenateGET($scope.text,locale).get().success((data) -> + $scope.hyphenation=data + ).error((data,status) -> + if (status==0) + $scope.errorStatus = 503 + $scope.error = "Service unavailable" + else + $scope.errorStatus = status + $scope.error = data + ) + ,1000)) + ) \ No newline at end of file diff --git a/app/assets/javascripts/playroutes.js b/app/assets/javascripts/playroutes.js new file mode 100644 index 0000000..4722029 --- /dev/null +++ b/app/assets/javascripts/playroutes.js @@ -0,0 +1,58 @@ +"use strict"; + +// The service - will be used by controllers or other services, filters, etc. +angular.module("play.routing", []).factory("playRoutes", function($http) { + + /* + * Wrap a Play JS function with a new function that adds the appropriate $http method. + * Note that the url has been already applied to the $http method so you only have to pass in + * the data (if any). + * Note: This is not only easier on the eyes, but must be called in a separate function with its own + * set of arguments, because otherwise JavaScript's function scope will bite us. + * @param playFunction The function from Play's jsRouter to be wrapped + */ + var wrapHttp = function(playFunction) { + return function(/*arguments*/) { + var routeObject = playFunction.apply(this, arguments); + var httpMethod = routeObject.method.toLowerCase(); + var url = routeObject.url; + var res = { + method : httpMethod, url : url, absoluteUrl : routeObject.absoluteURL, webSocketUrl : routeObject.webSocketURL + }; + res[httpMethod] = function(obj) { + return $http[httpMethod](url, obj); + }; + return res; + }; + }; + + // Add package object, in most cases "controllers" + var addPackageObject = function(packageName, service) { + if (!(packageName in playRoutes)) { + playRoutes[packageName] = {}; + } + }; + + // Add controller object, e.g. Application + var addControllerObject = function(packageName, controllerKey, service) { + if (!(controllerKey in playRoutes[packageName])) { + playRoutes[packageName][controllerKey] = {}; + } + }; + + var playRoutes = {}; + // Loop over all items in the jsRoutes generated by Play, wrap and add them to + // playRoutes + for ( var packageKey in jsRoutes) { + var packageObject = jsRoutes[packageKey]; + addPackageObject(packageKey, playRoutes); + for ( var controllerKey in packageObject) { + var controller = packageObject[controllerKey]; + addControllerObject(packageKey, controllerKey, playRoutes); + for ( var controllerMethodKey in controller) { + playRoutes[packageKey][controllerKey][controllerMethodKey] = wrapHttp(controller[controllerMethodKey]); + } + } + } + return playRoutes; +}); diff --git a/app/assets/stylesheets/index.less b/app/assets/stylesheets/index.less new file mode 100644 index 0000000..a2707c3 --- /dev/null +++ b/app/assets/stylesheets/index.less @@ -0,0 +1,14 @@ +body { + padding-top: 70px; + padding-bottom: 70px; +} + +.anchor { + position:relative; + top: -40px; + visibility: hidden; +} + +.affix,.navbar-fixed-top { + -webkit-transform: scale3d(1,1,1); +} diff --git a/app/binders/Binders.scala b/app/binders/Binders.scala new file mode 100644 index 0000000..2c93291 --- /dev/null +++ b/app/binders/Binders.scala @@ -0,0 +1,15 @@ +package binders + +import play.api.mvc.QueryStringBindable.Parsing +import play.api.i18n.Lang +import play.api.mvc.QueryStringBindable +import java.util.Locale + +/** + * Created by jiemakel on 24.10.2013. + */ +object Binders { + implicit object bindableLocale extends Parsing[Locale]( + new Locale(_), _.toString, (key: String, e: Exception) => "Cannot parse parameter %s as Locale: %s".format(key, e.getMessage) + ) +} diff --git a/app/controllers/LexicalAnalysisController.scala b/app/controllers/LexicalAnalysisController.scala new file mode 100644 index 0000000..6a66a66 --- /dev/null +++ b/app/controllers/LexicalAnalysisController.scala @@ -0,0 +1,407 @@ +/** + * + */ +package controllers + +import play.api.mvc._ +import play.api.libs.json.{JsValue, Json} +import play.api.Routes +import fi.seco.lexical.ILexicalAnalysisService +import fi.seco.lexical.LanguageRecognizer +import fi.seco.lexical.CompoundLexicalAnalysisService +import fi.seco.lexical.hfst.HFSTLexicalAnalysisService +import fi.seco.lexical.SnowballLexicalAnalysisService +import scala.collection.convert.WrapAsScala._ +import scala.collection.convert.WrapAsJava._ +import java.util.Locale + +import play.api.libs.json.Writes +import fi.seco.lexical.hfst.HFSTLexicalAnalysisService.WordToResults +import scala.Some +import scala.util.Try +import play.api.mvc.SimpleResult +import java.util +import services.lexicalanalysis.LanguageDetector +import play.api.libs.iteratee.{Iteratee, Concurrent} + +import scala.concurrent.ExecutionContext.Implicits.global + +/** + * @author jiemakel + * + */ +class LexicalAnalysisController(las: CompoundLexicalAnalysisService, hfstlas: HFSTLexicalAnalysisService, snowballlas: SnowballLexicalAnalysisService) extends Controller { + + def CORSAction(f: Request[AnyContent] => Result): Action[AnyContent] = { + Action { request => + f(request).withHeaders("Access-Control-Allow-Origin" -> "*") + } + } + + def CORSAction[A](bp: BodyParser[A])(f: Request[A] => Result): Action[A] = { + Action(bp) { request => + f(request).withHeaders("Access-Control-Allow-Origin" -> "*") + } + } + + def options = Action { + Ok("").withHeaders("Access-Control-Allow-Origin" -> "*", "Access-Control-Allow-Methods" -> "POST, GET, OPTIONS, PUT, DELETE", "Access-Control-Max-Age" -> "3600", "Access-Control-Allow-Headers" -> "Origin, X-Requested-With, Content-Type, Accept", "Access-Control-Allow-Credentials" -> "true") + } + + def index = Action { + Ok(views.html.index(this,LanguageRecognizer.getAvailableLanguages, LanguageDetector.supportedLanguages, snowballlas.getSupportedBaseformLocales.map(_.toString), hfstlas.getSupportedBaseformLocales.map(_.toString), hfstlas.getSupportedAnalyzeLocales.map(_.toString),hfstlas.getSupportedInflectionLocales.map(_.toString),hfstlas.getSupportedHyphenationLocales.map(_.toString) )) + } + + implicit def toResponse(res : Either[(JsValue, String),Either[String,JsValue]])(implicit request : Request[AnyContent]) : SimpleResult = { + res match { + case Left(x) => + if (Accepts.Html.unapply(request)) Redirect(x._2) + else Ok(x._1) + case Right(x) => x match { + case Left(y) => NotImplemented(y) + case Right(y) => Ok(y) + } + } + } + + def getBestLang(text: String, locales: Seq[String]) : Option[String] = { + if (locales.isEmpty) { + val lrResult = Option(LanguageRecognizer.getLanguageAsObject(text)).map(r => Map(r.getLang() -> r.getIndex)) + val detector = LanguageDetector() + detector.append(text) + val ldResult = detector.getProbabilities().map(l => Map(l.lang -> l.prob)) + val hfstResultTmp = hfstlas.getSupportedAnalyzeLocales.map(lang => + (lang.toString(), + hfstlas.analyze(text,lang).foldRight((0,0)) { (ar,count) => + if ((ar.getAnalysis.get(0).getParts().get(0).getTags.isEmpty || ar.getAnalysis.get(0).getParts().get(0).getTags.containsKey("PUNCT")) && ar.getAnalysis.get(0).getGlobalTags.isEmpty) + (count._1,count._2+1) + else (count._1+1,count._2+1) + } + )).filter(_._2._1!=0).toSeq.view.sortBy(_._2._1).reverse.map(p => (p._1 , p._2._1.asInstanceOf[Double]/p._2._2)) + val tc = hfstResultTmp.foldRight(0.0) {_._2+_} + val hfstResult = hfstResultTmp.map(p => Map(p._1 -> p._2/tc)) + Try(Some((ldResult ++ hfstResult ++ lrResult).groupBy(_.keysIterator.next).mapValues(_.foldRight(0.0){(p,r) => r+p.valuesIterator.next}/3.0).maxBy(_._2)._1)).getOrElse(None) + } else { + val lrResult = Option(LanguageRecognizer.getLanguageAsObject(text,locales:_*)).map(r => Map(r.getLang() -> r.getIndex)) + val detector = LanguageDetector() + detector.setPriorMap(new util.HashMap(mapAsJavaMap(locales.map((_,new java.lang.Double(1.0))).toMap))) + detector.append(text) + val ldResult = detector.getProbabilities().map(l => Map(l.lang -> l.prob)) + val hfstResultTmp = locales.map(new Locale(_)).intersect(hfstlas.getSupportedAnalyzeLocales.toSeq).map(lang => + (lang.toString(), + hfstlas.analyze(text,lang).foldRight((0,0)) { (ar,count) => + if ((ar.getAnalysis.get(0).getParts().get(0).getTags.isEmpty || ar.getAnalysis.get(0).getParts().get(0).getTags.containsKey("PUNCT")) && ar.getAnalysis.get(0).getGlobalTags.isEmpty) + (count._1,count._2+1) + else (count._1+1,count._2+1) + } + )).filter(_._2._1!=0).toSeq.view.sortBy(_._2._1).reverse.map(p => (p._1 , p._2._1.asInstanceOf[Double]/p._2._2)) + val tc = hfstResultTmp.foldRight(0.0) {_._2+_} + val hfstResult = hfstResultTmp.map(p => Map(p._1 -> p._2/tc)) + Try(Some((ldResult ++ hfstResult ++ lrResult).groupBy(_.keysIterator.next).mapValues(_.foldRight(0.0){(p,r) => r+p.valuesIterator.next}/3.0).maxBy(_._2)._1)).getOrElse(None) + + } + } + + def identify(text: Option[String], locales: Seq[String]) : Either[(JsValue, String),Either[String,JsValue]] = { + text match { + case Some(text) => + if (!locales.isEmpty) { + val lrResult = Option(LanguageRecognizer.getLanguageAsObject(text,locales:_*)).map(r => Map(r.getLang() -> r.getIndex)) + val detector = LanguageDetector() + detector.setPriorMap(new util.HashMap(mapAsJavaMap(locales.map((_,new java.lang.Double(1.0))).toMap))) + detector.append(text) + val ldResult = detector.getProbabilities().map(l => Map(l.lang -> l.prob)) + val hfstResultTmp = locales.map(new Locale(_)).intersect(hfstlas.getSupportedAnalyzeLocales.toSeq).map(lang => + (lang.toString(), + hfstlas.analyze(text,lang).foldRight((0,0)) { (ar,count) => + if ((ar.getAnalysis.get(0).getParts().get(0).getTags.isEmpty || ar.getAnalysis.get(0).getParts().get(0).getTags.containsKey("PUNCT")) && ar.getAnalysis.get(0).getGlobalTags.isEmpty) + (count._1,count._2+1) + else (count._1+1,count._2+1) + } + )).filter(_._2._1!=0).toSeq.view.sortBy(_._2._1).reverse.map(p => (p._1 , p._2._1.asInstanceOf[Double]/p._2._2)) + val tc = hfstResultTmp.foldRight(0.0) {_._2+_} + val hfstResult = hfstResultTmp.map(p => Map(p._1 -> p._2/tc)) + val bestGuess = Try(Some((ldResult ++ hfstResult ++ lrResult).groupBy(_.keysIterator.next).mapValues(_.foldRight(0.0){(p,r) => r+p.valuesIterator.next}/3.0).maxBy(_._2))).getOrElse(None) + bestGuess match { + case Some(lang) => Right(Right(Json.toJson(Map("locale"->Json.toJson(lang._1),"certainty" -> Json.toJson(lang._2),"details"->Json.toJson(Map("languageRecognizerResults"->Json.toJson(lrResult), "languageDetectorResults" -> Json.toJson(ldResult), "hfstAcceptorResults" -> Json.toJson(hfstResult))))))) + case None => Right(Left(s"Couldn't categorize $text into any of requested languages (${locales.mkString(", ")})")) + } + } else { + val lrResult = Option(LanguageRecognizer.getLanguageAsObject(text)).map(r => Map(r.getLang() -> r.getIndex)) + val detector = LanguageDetector() + detector.append(text) + val ldResult = detector.getProbabilities().map(l => Map(l.lang -> l.prob)) + val hfstResultTmp = hfstlas.getSupportedAnalyzeLocales.map(lang => + (lang.toString(), + hfstlas.analyze(text,lang).foldRight((0,0)) { (ar,count) => + if ((ar.getAnalysis.get(0).getParts().get(0).getTags.isEmpty || ar.getAnalysis.get(0).getParts().get(0).getTags.containsKey("PUNCT")) && ar.getAnalysis.get(0).getGlobalTags.isEmpty) + (count._1,count._2+1) + else (count._1+1,count._2+1) + } + )).filter(_._2._1!=0).toSeq.view.sortBy(_._2._1).reverse.map(p => (p._1 , p._2._1.asInstanceOf[Double]/p._2._2)) + val tc = hfstResultTmp.foldRight(0.0) {_._2+_} + val hfstResult = hfstResultTmp.map(p => Map(p._1 -> p._2/tc)) + val bestGuess = Try(Some((ldResult ++ hfstResult ++ lrResult).groupBy(_.keysIterator.next).mapValues(_.foldRight(0.0){(p,r) => r+p.valuesIterator.next}/3.0).maxBy(_._2))).getOrElse(None) + bestGuess match { + case Some(lang) => Right(Right(Json.toJson(Map("locale"->Json.toJson(lang._1),"certainty" -> Json.toJson(lang._2),"details"->Json.toJson(Map("languageRecognizerResults"->Json.toJson(lrResult), "languageDetectorResults" -> Json.toJson(ldResult), "hfstAcceptorResults" -> Json.toJson(hfstResult))))))) + case None => Right(Left(s"Couldn't categorize $text into any of the supported languages (${(LanguageRecognizer.getAvailableLanguages ++ LanguageDetector.supportedLanguages ++ hfstlas.getSupportedAnalyzeLocales.map(_.toString)).sorted.distinct.mkString(", ")})")) + } + } + case None => + Left((Json.toJson(Map( "acceptedLocales" -> (LanguageRecognizer.getAvailableLanguages ++ LanguageDetector.supportedLanguages ++ hfstlas.getSupportedAnalyzeLocales.map(_.toString)).sorted.distinct)),controllers.routes.LexicalAnalysisController.index + "#language_recognition")) + } + } + + def toWSResponse(res : Either[(JsValue, String),Either[String,JsValue]]) : JsValue = { + res match { + case Left(x) => x._1 + case Right(x) => x match { + case Left(y) => Json.toJson(Map("error" -> y)) + case Right(y) => y + } + } + } + + def identifyGET(text: Option[String], locales: List[String]) = CORSAction { implicit request => + identify(text,locales) + } + + def identifyPOST = CORSAction { implicit request => + val formBody = request.body.asFormUrlEncoded; + val jsonBody = request.body.asJson; + formBody.map { data => + toResponse(identify(data.get("text").map(_.head),data.get("locales").getOrElse(Seq.empty))) + }.getOrElse { + jsonBody.map { data => + toResponse(identify((data \ "text").asOpt[String],(data \ "locales").asOpt[Seq[String]].getOrElse(Seq.empty))) + }.getOrElse { + BadRequest("Expecting either a JSON or a form-url-encoded body") + } + } + } + + def identifyWS = WebSocket.using[JsValue] { req => + + //Concurrent.broadcast returns (Enumerator, Concurrent.Channel) + val (out,channel) = Concurrent.broadcast[JsValue] + + //log the message to stdout and send response back to client + val in = Iteratee.foreach[JsValue] { + data => channel push toWSResponse(identify((data \ "text").asOpt[String],(data \ "locales").asOpt[Seq[String]].getOrElse(Seq.empty))) + } + (in,out) + } + + def baseform(text: Option[String], locale: Option[Locale]) : Either[(JsValue,String),Either[String,JsValue]] = { + text match { + case Some(text) => + locale match { + case Some(locale) => if (las.getSupportedBaseformLocales.contains(locale)) Right(Right(Json.toJson(las.baseform(text, locale)))) else Right(Left(s"Locale $locale not in the supported locales (${las.getSupportedBaseformLocales.mkString(", ")})")) + case None => getBestLang(text,las.getSupportedBaseformLocales.toSeq.map(_.toString)) match { + case Some(lang) => Right(Right(Json.toJson(Map("locale" -> lang, "baseform" -> las.baseform(text, new Locale(lang)))))) + case None => Right(Left(s"Couldn't categorize $text into any of the supported languages (${las.getSupportedBaseformLocales.mkString(", ")})")) + } + } + case None => + Left((Json.toJson(Map( "acceptedLocales" -> las.getSupportedBaseformLocales.map(_.toString).toSeq.sorted)),controllers.routes.LexicalAnalysisController.index + "#lemmatization")) + } + } + + def baseformGET(text: Option[String], locale: Option[Locale]) = CORSAction { implicit request => + baseform(text,locale) + } + + def baseformPOST = CORSAction { implicit request => + val formBody = request.body.asFormUrlEncoded; + val jsonBody = request.body.asJson; + formBody.map { data => + toResponse(baseform(data.get("text").map(_.head),data.get("locale").map(l => new Locale(l.head)))) + }.getOrElse { + jsonBody.map { data => + toResponse(baseform((data \ "text").asOpt[String],(data \ "locale").asOpt[String].map(l => new Locale(l)))) + }.getOrElse { + BadRequest("Expecting either a JSON or a form-url-encoded body") + } + } + } + + def baseformWS = WebSocket.using[JsValue] { req => + + //Concurrent.broadcast returns (Enumerator, Concurrent.Channel) + val (out,channel) = Concurrent.broadcast[JsValue] + + //log the message to stdout and send response back to client + val in = Iteratee.foreach[JsValue] { + data => channel push toWSResponse(baseform((data \ "text").asOpt[String],(data \ "locale").asOpt[String].map(l => new Locale(l)))) + } + (in,out) + } + + implicit val WordPartWrites = new Writes[HFSTLexicalAnalysisService.Result.WordPart] { + def writes(r : HFSTLexicalAnalysisService.Result.WordPart) : JsValue = { + Json.obj( + "lemma" -> r.getLemma, + "tags" -> Json.toJson(r.getTags.toMap.mapValues(iterableAsScalaIterable(_))) + ) + } + } + + implicit val ResultWrites = new Writes[HFSTLexicalAnalysisService.Result] { + def writes(r : HFSTLexicalAnalysisService.Result) : JsValue = { + Json.obj( + "weight" -> r.getWeight, + "wordParts" -> Json.toJson(r.getParts.map(Json.toJson(_))), + "globalTags" -> Json.toJson(r.getGlobalTags.toMap.mapValues(iterableAsScalaIterable(_))) + ) + } + } + + implicit val wordToResultsWrites = new Writes[WordToResults] { + def writes(r: WordToResults) : JsValue = { + Json.obj( + "word" -> r.getWord, + "analysis" -> Json.toJson(r.getAnalysis.map(Json.toJson(_))) + ) + } + } + + def analyze(text: Option[String], locale: Option[Locale]) : Either[(JsValue,String),Either[String,JsValue]] = { + text match { + case Some(text) => + locale match { + case Some(locale) => if (hfstlas.getSupportedAnalyzeLocales.contains(locale)) Right(Right(Json.toJson(hfstlas.analyze(text, locale).toList))) else Right(Left(s"Locale $locale not in the supported locales (${hfstlas.getSupportedAnalyzeLocales.mkString(", ")})")) + case None => getBestLang(text,hfstlas.getSupportedAnalyzeLocales.toSeq.map(_.toString)) match { + case Some(lang) => Right(Right(Json.toJson(Map("locale" -> Json.toJson(lang), "analysis" -> Json.toJson(hfstlas.analyze(text, new Locale(lang)).toList))))) + case None => Right(Left(s"Couldn't categorize $text into any of the supported languages (${hfstlas.getSupportedAnalyzeLocales.mkString(", ")})")) + } + } + case None => + Left((Json.toJson(Map( "acceptedLocales" -> hfstlas.getSupportedAnalyzeLocales.map(_.toString).toSeq.sorted))),controllers.routes.LexicalAnalysisController.index + "#morphological_analysis") + } + } + + def analyzeGET(text: Option[String], locale: Option[Locale]) = CORSAction { implicit request => + analyze(text,locale) + } + + def analyzePOST = CORSAction { implicit request => + val formBody = request.body.asFormUrlEncoded; + val jsonBody = request.body.asJson; + formBody.map { data => + toResponse(analyze(data.get("text").map(_.head),data.get("locale").map(l => new Locale(l.head)))) + }.getOrElse { + jsonBody.map { data => + toResponse(analyze((data \ "text").asOpt[String],(data \ "locale").asOpt[String].map(l => new Locale(l)))) + }.getOrElse { + BadRequest("Expecting either a JSON or a form-url-encoded body") + } + } + } + + def analyzeWS = WebSocket.using[JsValue] { req => + + //Concurrent.broadcast returns (Enumerator, Concurrent.Channel) + val (out,channel) = Concurrent.broadcast[JsValue] + + //log the message to stdout and send response back to client + val in = Iteratee.foreach[JsValue] { + data => channel push toWSResponse(analyze((data \ "text").asOpt[String],(data \ "locale").asOpt[String].map(l => new Locale(l)))) + } + (in,out) + } + + def inflect(text: Option[String], forms: Seq[String], baseform: Boolean, locale : Option[Locale]) : Either[(JsValue, String),Either[String,JsValue]] = { + text match { + case Some(text) => + locale match { + case Some(locale) => if (hfstlas.getSupportedInflectionLocales.contains(locale)) Right(Right(Json.toJson(hfstlas.inflect(text, forms, baseform, locale)))) else Right(Left(s"Locale $locale not in the supported locales (${hfstlas.getSupportedInflectionLocales.mkString(", ")})")) + case None => getBestLang(text,hfstlas.getSupportedInflectionLocales.toSeq.map(_.toString)) match { + case Some(lang) => Right(Right(Json.toJson(Map("locale" -> Json.toJson(lang), "inflection" -> Json.toJson(hfstlas.inflect(text, forms, baseform, new Locale(lang))))))) + case None => Right(Left(s"Couldn't categorize $text into any of the supported languages (${hfstlas.getSupportedInflectionLocales.mkString(", ")})")) + } + } + case None => + Left((Json.toJson(Map( "acceptedLocales" -> hfstlas.getSupportedInflectionLocales.map(_.toString).toSeq.sorted))),controllers.routes.LexicalAnalysisController.index + "#morphological_analysis") + } + } + + + def inflectGET(text: Option[String], forms: Seq[String], baseform: Boolean, locale : Option[Locale]) = CORSAction { implicit request => + inflect(text,forms,baseform,locale) + } + + def inflectPOST = CORSAction { implicit request => + val formBody = request.body.asFormUrlEncoded; + val jsonBody = request.body.asJson; + formBody.map { data => + toResponse(inflect(data.get("text").map(_.head),data.get("forms").getOrElse(Seq.empty),data.get("baseform").map(s => Try(s.head.toBoolean).getOrElse(true)).getOrElse(true),data.get("locale").map(l => new Locale(l.head)))) + }.getOrElse { + jsonBody.map { data => + toResponse(inflect((data \ "text").asOpt[String],(data \ "forms").asOpt[Seq[String]].getOrElse(Seq.empty), (data \ "baseform").asOpt[Boolean].getOrElse(true), (data \ "locale").asOpt[String].map(l => new Locale(l)))) + }.getOrElse { + BadRequest("Expecting either a JSON or a form-url-encoded body") + } + } + } + + def inflectWS = WebSocket.using[JsValue] { req => + + //Concurrent.broadcast returns (Enumerator, Concurrent.Channel) + val (out,channel) = Concurrent.broadcast[JsValue] + + //log the message to stdout and send response back to client + val in = Iteratee.foreach[JsValue] { + data => channel push toWSResponse(inflect((data \ "text").asOpt[String],(data \ "forms").asOpt[Seq[String]].getOrElse(Seq.empty), (data \ "baseform").asOpt[Boolean].getOrElse(true), (data \ "locale").asOpt[String].map(l => new Locale(l)))) + } + (in,out) + } + + def hyphenate(text: Option[String], locale: Option[Locale]) : Either[(JsValue,String),Either[String,JsValue]] = { + text match { + case Some(text) => + locale match { + case Some(locale) => if (hfstlas.getSupportedHyphenationLocales.contains(locale)) Right(Right(Json.toJson(hfstlas.hyphenate(text, locale)))) else Right(Left(s"Locale $locale not in the supported locales (${hfstlas.getSupportedHyphenationLocales.mkString(", ")})")) + case None => getBestLang(text,hfstlas.getSupportedHyphenationLocales.toSeq.map(_.toString)) match { + case Some(lang) => Right(Right(Json.toJson(Map("locale" -> Json.toJson(lang), "hyphenation" -> Json.toJson(hfstlas.hyphenate(text, new Locale(lang))))))) + case None => Right(Left(s"Couldn't categorize $text into any of the supported languages (${hfstlas.getSupportedHyphenationLocales.mkString(", ")})")) + } + } + case None => + Left((Json.toJson(Map( "acceptedLocales" -> hfstlas.getSupportedHyphenationLocales.map(_.toString).toSeq.sorted))),controllers.routes.LexicalAnalysisController.index + "#hyphenation") + } + } + + def hyphenateGET(text: Option[String], locale: Option[Locale]) = CORSAction { implicit request => + hyphenate(text,locale) + } + + def hyphenatePOST = CORSAction { implicit request => + val formBody = request.body.asFormUrlEncoded; + val jsonBody = request.body.asJson; + formBody.map { data => + toResponse(hyphenate(data.get("text").map(_.head),data.get("locale").map(l => new Locale(l.head)))) + }.getOrElse { + jsonBody.map { data => + toResponse(hyphenate((data \ "text").asOpt[String],(data \ "locale").asOpt[String].map(l => new Locale(l)))) + }.getOrElse { + BadRequest("Expecting either a JSON or a form-url-encoded body") + } + } + } + + def hyphenateWS = WebSocket.using[JsValue] { req => + + //Concurrent.broadcast returns (Enumerator, Concurrent.Channel) + val (out,channel) = Concurrent.broadcast[JsValue] + + //log the message to stdout and send response back to client + val in = Iteratee.foreach[JsValue] { + data => channel push toWSResponse(hyphenate((data \ "text").asOpt[String],(data \ "locale").asOpt[String].map(l => new Locale(l)))) + } + (in,out) + } + + def javascriptRoutes = Action { implicit request => + Ok(Routes.javascriptRouter("jsRoutes")(routes.javascript.LexicalAnalysisController.baseformGET, routes.javascript.LexicalAnalysisController.analyzeGET, routes.javascript.LexicalAnalysisController.identifyGET, routes.javascript.LexicalAnalysisController.hyphenateGET,routes.javascript.LexicalAnalysisController.inflectGET)).as(JAVASCRIPT) + } +} \ No newline at end of file diff --git a/app/services/lexicalanalysis/LexicalAnalysisModule.scala b/app/services/lexicalanalysis/LexicalAnalysisModule.scala new file mode 100644 index 0000000..6d89925 --- /dev/null +++ b/app/services/lexicalanalysis/LexicalAnalysisModule.scala @@ -0,0 +1,34 @@ +/** + * + */ +package services.lexicalanalysis + +import com.softwaremill.macwire.MacwireMacros._ +import fi.seco.lexical.CompoundLexicalAnalysisService +import fi.seco.lexical.LanguageRecognizer +import fi.seco.lexical.hfst.HFSTLexicalAnalysisService +import fi.seco.lexical.SnowballLexicalAnalysisService +import com.cybozu.labs.langdetect.Detector +import scala.util.Try +import com.typesafe.scalalogging.slf4j.Logging + +/** + * @author jiemakel + * + */ +trait LexicalAnalysisModule { + lazy val hfstlas = new HFSTLexicalAnalysisService() + lazy val snowballlas = new SnowballLexicalAnalysisService() + lazy val clas = new CompoundLexicalAnalysisService(hfstlas, snowballlas) + +} + +object LanguageDetector extends Logging { + def apply() = com.cybozu.labs.langdetect.DetectorFactory.create() + val supportedLanguages = Array("af","am","ar","az","be","bg","bn","bo","ca","cs","cy","da","de","dv","el","en","es","et","eu","fa","fi","fo","fr","ga","gn","gu","he","hi","hr","hu","hy","id","is","it","ja","jv","ka","kk","km","kn","ko","ky","lb","lij","ln","lt","lv","mi","mk","ml", "mn", "mr", "mt", "my", "ne", "nl", "no", "os", "pa", "pl", "pnb", "pt", "qu", "ro", "si", "sk", "so", "sq", "sr", "sv", "sw", "ta", "te", "th", "tk", "tl", "tr", "tt", "ug", "uk", "ur", "uz", "vi", "yi", "yo", "zh-cn", "zh-tw") + try { + com.cybozu.labs.langdetect.DetectorFactory.loadProfiles(supportedLanguages:_*) + } catch { + case e: Exception => logger.warn("Couldn't load language profiles",e) + } +} \ No newline at end of file diff --git a/app/views/assetMode.scala b/app/views/assetMode.scala new file mode 100644 index 0000000..0eb9a59 --- /dev/null +++ b/app/views/assetMode.scala @@ -0,0 +1,21 @@ +package views.html.helper + +import play.api.templates.Html +import play.api.mvc.{Call} +import play.api.{Play, Mode} +import controllers.routes + +/** Make the app explicit for testing */ +trait RequiresApp { + implicit val app = play.api.Play.current +} + +object assetMode extends RequiresApp { + def apply(scriptNameDev: String)(scriptNameProd: String = scriptNameDev)(scriptNameTest : String = scriptNameProd): String = { + app.mode match { + case Mode.Dev => scriptNameDev + case Mode.Test => scriptNameTest + case Mode.Prod => scriptNameProd + } + } +} diff --git a/app/views/index.scala.html b/app/views/index.scala.html new file mode 100644 index 0000000..a14298f --- /dev/null +++ b/app/views/index.scala.html @@ -0,0 +1,269 @@ +@(ctrl : LexicalAnalysisController, supportedLanguageRecognizerLocales: Iterable[String], supportedLanguageDetectorLocales: Iterable[String], supportedSnowballLocales: Iterable[String],supportedHFSTBaseformLocales: Iterable[String],supportedHFSTAnalyzeLocales: Iterable[String],supportedHFSTInflectionLocales: Iterable[String],supportedHFSTHyphenationLocales: Iterable[String]) + + + + + SeCo Lexical Analysis Services + + + + + + + + + + + + + + +
+ +
+
+ +
+

SeCo Lexical Analysis Services

+

+ We provide the following JSON-returning Web Services: +

+ +

+ The tools backing these services are mostly not originally our own, but we've wrapped them for your convenience. For specifics, see the details of each service. + For general questions about this service, contact eetu.makela@@aalto.fi. +

+
+ +
+
+

Language Recognition

+

+ Tries to recognize the language of an input. Call with e.g. + @controllers.routes.LexicalAnalysisController.identifyGET(Some("The quick brown fox jumps over the lazy dog"),List.empty)
+ or with a list of possible locales, e.g. @controllers.routes.LexicalAnalysisController.identifyGET(Some("The quick brown fox jumps over the lazy dog"),List("fi","en","sv"))
+ Also available using HTTP POST with parameters given either as form-urlencoded or JSON. For intensive use, there is also a JSON-understanding WebSocket-version at @controllers.routes.LexicalAnalysisController.identifyWS. All methods are CORS-enabled.
+ + Returns results as JSON, e.g.: + 

@ctrl.identify(Some("The quick brown fox jumps over the lazy dog"),List.empty).right.get.right.get
+ When called without parameters but with an Accept header other than text/html, returns the supported locales as JSON, e.g.: + 
@ctrl.identify(None,Seq.empty).left.get._1
+

+

+ In total, the service supports @((supportedLanguageDetectorLocales ++ supportedLanguageRecognizerLocales ++ supportedHFSTAnalyzeLocales.map(_.toString)).toSeq.sorted.distinct.size) locales, combining results from three sources: +

    +
  1. The langdetect library (locales @supportedLanguageDetectorLocales.toSeq.sorted.mkString(", ")),
    2. +
  2. custom code based on the list of cues at the Wikipedia language recognition chart (locales @supportedLanguageRecognizerLocales.toSeq.sorted.mkString(", ")), and
    3. +
  3. finite state transducers provided by the HFST, Omorfi and Giellatekno projects (locales @supportedHFSTAnalyzeLocales.toSeq.sorted.mkString(", "))
    4. +
+ + Where multiple sources are available for a language, they + seem to complement each other nicely. The probabilistic + langdetect library generally gives good results, but can + give incorrect results on short strings. The finite state + transducers on the other hand reliably recognize even single + words as belonging to a language, but may have problems + discerning between closely related languages when sentences + contain many compound, loan or slang words. The custom code + finally sits method-wise between the other two, breaking + ties between them. +

+ +
+ (updates dynamically) +
+ +
+
Guessed language: {{guessedLang}}
+
Service returned error {{errorStatus}}:
{{error}}
+
+
+ +
+ +
+

Lemmatization

+

+ Lemmatizes the input into its base form.
+ Call with e.g. @controllers.routes.LexicalAnalysisController.baseformGET(Some("Albert osti fagotin ja töräytti puhkuvan melodian."),Some(new java.util.Locale("fi")))
+ or just @controllers.routes.LexicalAnalysisController.baseformGET(Some("The quick brown fox jumps over the lazy dog"),None) to guess locale.
+ Also available using HTTP POST with parameters given either as form-urlencoded or JSON. For intensive use, there is also a JSON-understanding WebSocket-version at @controllers.routes.LexicalAnalysisController.baseformWS. All methods are CORS-enabled.
+ Returns results as JSON (e.g. @ctrl.baseform(Some("Albert osti fagotin ja töräytti puhkuvan melodian."),Some(new java.util.Locale("fi"))).right.get.right.get or @ctrl.baseform(Some("The quick brown fox jumps over the lazy dog"),None).right.get.right.get)
+ When called without parameters but with an Accept header other than text/html, returns the @((supportedSnowballLocales++supportedHFSTBaseformLocales).toSeq.distinct.size) supported locales as JSON. +

+ +

+ Uses finite state transducers provided by the HFST, Omorfi and Giellatekno projects where available (locales @supportedHFSTBaseformLocales.toSeq.sorted.mkString(", ")). Note that the quality and scope of the lemmatization varies wildly between languages.
+ Snowball stemmers are used for locales @((supportedSnowballLocales.toSeq diff supportedHFSTBaseformLocales.toSeq).sorted.mkString(", ")) (not used: @((supportedSnowballLocales.toSeq intersect supportedHFSTBaseformLocales.toSeq).sorted.mkString(", "))) +

+ + +
+ (updates dynamically) +
+ +
+
Lemmatized: {{baseform}}
+
Service returned error {{errorStatus}}:
{{error}}
+
+ +
+ +
+ +
+
+
+ +
+ +
+

Morphological Analysis

+

+ Gives a morphological analysis of the text. Call with e.g. @controllers.routes.LexicalAnalysisController.analyzeGET(Some("Albert osti"),Some(new java.util.Locale("fi")))
+ or just @controllers.routes.LexicalAnalysisController.analyzeGET(Some("Bier bitte"),None) to guess locale.
+ Also available using HTTP POST with parameters given either as form-urlencoded or JSON. For intensive use, there is also a JSON-understanding WebSocket-version at @controllers.routes.LexicalAnalysisController.analyzeWS. All methods are CORS-enabled.
+ Returns results as JSON, e.g.: + 

@play.api.libs.json.Json.prettyPrint(ctrl.analyze(Some("Albert osti"),Some(new java.util.Locale("fi"))).right.get.right.get)
or + 
@play.api.libs.json.Json.prettyPrint(ctrl.analyze(Some("Bier bitte"),None).right.get.right.get)
+ When called without parameters but with an Accept header other than text/html, returns the @(supportedHFSTAnalyzeLocales.size) supported locales as JSON (e.g. @ctrl.analyze(None,None).left.get._1). +

+

+ Uses finite state transducers provided by the HFST, Omorfi and Giellatekno projects. Note that the quality and scope of analysis as well as tags returned vary wildly between languages. +

+
+ (updates dynamically) +
+ +
+
Analysis: {{analysis}}
+
Service returned error {{errorStatus}}:
{{error}}
+
+ +
+ +
+ +
+
+
+ +
+ +
+

Inflected Form Generation

+

+ Transforms the text given a set of inflection forms, by default also converting words not matching the inflection forms to their base form. Call with e.g. @controllers.routes.LexicalAnalysisController.inflectGET(Some("Albert osti fagotin"),List("V N Nom Sg","N Nom Pl"),true,Some(new java.util.Locale("fi")))
+ or @controllers.routes.LexicalAnalysisController.inflectGET(Some("Albert osti fagotin"),List("V N Nom Sg","N Nom Pl"),false,Some(new java.util.Locale("fi")))
+ Also available using HTTP POST with parameters given either as form-urlencoded or JSON. For intensive use, there is also a JSON-understanding WebSocket-version at @controllers.routes.LexicalAnalysisController.inflectWS. All methods are CORS-enabled.
+ Returns results as JSON (e.g. @ctrl.inflect(Some("Albert osti fagotin"),List("V N Nom Sg","N Nom Pl"),true,Some(new java.util.Locale("fi"))).right.get.right.get)
+ When called without parameters but with an Accept header other than text/html, returns the @(supportedHFSTInflectionLocales.size) supported locales as JSON (e.g. @ctrl.inflect(None,Seq.empty,false,None).left.get._1). +

+

+ Uses finite state transducers provided by the HFST, Omorfi and Giellatekno projects. Note that the inflection form syntaxes differ wildly between languages. +

+
+ (updates dynamically) +
+ +
+
Inflected: {{inflection}}
+
Service returned error {{errorStatus}}:
{{error}}
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+ +
+ +
+
+ +
+ +
+ +
+

Hyphenation

+

+ Hyphenates the given text. Call with e.g. @controllers.routes.LexicalAnalysisController.hyphenateGET(Some("Albert osti fagotin ja töräytti puhkuvan melodian."),Some(new java.util.Locale("fi")))
+ or just @controllers.routes.LexicalAnalysisController.hyphenateGET(Some("ein Bier bitte"),None) to guess locale.
+ Also available using HTTP POST with parameters given either as form-urlencoded or JSON. For intensive use, there is also a JSON-understanding WebSocket-version at @controllers.routes.LexicalAnalysisController.hyphenateWS. All methods are CORS-enabled.
+ Returns results as JSON (e.g. @ctrl.hyphenate(Some("Albert osti fagotin ja töräytti puhkuvan melodian."),Some(new java.util.Locale("fi"))).right.get.right.get or @ctrl.hyphenate(Some("ein Bier bitte"),None).right.get.right.get)
+ When called without parameters but with an Accept header other than text/html, returns the @(supportedHFSTHyphenationLocales.size) supported locales as JSON, e.g.: + 

@ctrl.hyphenate(None,None).left.get._1
+

+

+ Uses finite state transducers provided by the HFST, Omorfi and Giellatekno projects. Those provided by HFST have been automatically translated from the TeX CTAN distribution's hyphenation rulesets. +

+
+ (updates dynamically) +
+ +
+
hyphenated: {{hyphenation}}
+
Service returned error {{errorStatus}}:
{{error}}
+
+ +
+ +
+ +
+
+ +
+ +
+ + diff --git a/build.sbt b/build.sbt new file mode 100644 index 0000000..c52131c --- /dev/null +++ b/build.sbt @@ -0,0 +1,30 @@ +import play.Project._ + +name := """lexicalanalysis-play""" + +version := "1.0-SNAPSHOT" + +libraryDependencies ++= Seq( + "org.webjars" %% "webjars-play" % "2.2.0", + "org.webjars" % "bootstrap" % "3.0.0", + "org.webjars" % "underscorejs" % "1.5.2", + "org.webjars" % "angularjs" % "1.2.0-rc.3", + "org.webjars" % "angular-ui-router" % "0.2.0", + "com.softwaremill.macwire" %% "macros" % "0.5", + "fi.seco" % "lexicalanalysis" % "1.0.0", + "com.cybozu.labs" % "langdetect" % "1.2.2" exclude("net.arnx.jsonic", "jsonic"), + "net.arnx" % "jsonic" % "1.3.0", //langdetect pulls in ancient unavailable version + "org.mockito" % "mockito-core" % "1.9.5" % "test", + "com.typesafe" %% "scalalogging-slf4j" % "1.0.1" +) + +resolvers ++= Seq( + "Local Maven Repository" at Path.userHome.asFile.toURI.toURL + ".m2/repository", + "Github Imagination" at "https://github.com/Imaginatio/Maven-repository/raw/master" +) + +playScalaSettings + +routesImport ++= Seq("binders.Binders._","java.util.Locale") + +net.virtualvoid.sbt.graph.Plugin.graphSettings diff --git a/conf/application.conf b/conf/application.conf new file mode 100644 index 0000000..574eaf2 --- /dev/null +++ b/conf/application.conf @@ -0,0 +1,70 @@ +# This is the main configuration file for the application. +# ~~~~~ + +# Secret key +# ~~~~~ +# The secret key is used to secure cryptographics functions. +# If you deploy your application to several instances be sure to use the same key! +application.secret="b]4y[mp`niu[i>dg zfKP}kP{C0XN2$_1hfSRinL6`VALpw+4iteSpcI4+WWd?TvJi0~dBWKKqP_*3i^&kK zIEX1YDuOixfFTSN|NsC0l#o+@fsxcv666;Qq(Ol9_(3kl6WnGT9E~e$**VR_H5i%L z)gsw4I-^Y`nKPAVPo7?u?(JJTZH`LrmWdl?_0OLmy8rm1b*pwwS-tQ?;?3u4Z>&#} zzV^7|)}7l=uFF&$ICd!zR$Vw=9JrA*oPf9vbMCqLg-?vIXbVTLaEy4HMCTmS*BWbhopv<`sQBS;K#hGYVC@U#&wS29*nP~GkGOu z^_*4P92I*dXwCK6zFRh4Ww?>Haa;L~jOyicx0RMgS62nfye#;(Q{vd$LgSv(uS+_t z8ESL>Gd$;KVQ#*2!Qi!X=68Tv*TU9Vn(KV!^TP{UkE(VuOg+74 zgHUAe8qPnv{xo$+&yKz*akFpI+`IBjJ@4NZ|6x2W%l63f@ZuXA3xq6t=RRD|I4^#} z>DAdq#j}+SYuw+-%bg6iId9;&=Dg#iAKhI)KFvC^{d>O+)1NO(3`DQ~+gu_fxc}0o zT4t4h7JFRxZ|ehwrfP|6L`h0wNvc(HQ7VvPFfuSS)-^QHHL?gXG_W!?ure{%HZZa> zFlhT)+=ZecH$NpatrDccK-a)h*T5*m(8S8X+{)BY+rSv8L9jnH3#fs?)78&qol`;+ E017_S0RR91 literal 0 HcmV?d00001 diff --git a/public/images/secologo.png b/public/images/secologo.png new file mode 100644 index 0000000000000000000000000000000000000000..29e3c6935ea047c106f50050d0bd804504df5e88 GIT binary patch literal 5393 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 literal 0 HcmV?d00001