Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fix cognitive service errors #1176

Merged
merged 14 commits into from
Sep 10, 2021
+479 −125
Merged

fix: fix cognitive service errors #1176

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
946d73d
fix: fix Left & Right errors
serena-ruan Sep 1, 2021
081797f
add triggering error if required params are not set
serena-ruan Sep 1, 2021
d856987
throw error in shouldSkip instead
serena-ruan Sep 1, 2021
280122f
fix flaky confidence value in DescribeImage
serena-ruan Sep 1, 2021
e75cfba
support autoconversion of string to Seq[string] for toLanguage & Text
serena-ruan Sep 1, 2021
e667728
fix inputFunc
serena-ruan Sep 1, 2021
8bb1f52
fix Exception type & add null test
serena-ruan Sep 2, 2021
b0d3be6
support text as stringType in dataframe for translators & add reshapi…
serena-ruan Sep 3, 2021
c124660
update format
serena-ruan Sep 3, 2021
4a7553e
Merge branch 'master' into serena/bugFix
serena-ruan Sep 6, 2021
7dd0e9f
catch required params not set error at head node & add more tests to …
serena-ruan Sep 6, 2021
af052b1
Merge branch 'master' into serena/bugFix
serena-ruan Sep 9, 2021
b330bb3
address comments
serena-ruan Sep 9, 2021
50a574b
Merge branch 'master' into serena/bugFix
serena-ruan Sep 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions cognitive/src/main/scala/com/microsoft/ml/spark/cognitive/CognitiveServiceBase.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,12 @@ abstract class CognitiveServicesBaseNoHandler(val uid: String) extends Transform
assert(badColumns.isEmpty,
s"Could not find dynamic columns: $badColumns in columns: ${schema.fieldNames.toSet}")

val missingRequiredParams = this.getRequiredParams.filter {
p => this.get(p).isEmpty && this.getDefault(p).isEmpty
}
assert(missingRequiredParams.isEmpty,
s"Missing required params: ${missingRequiredParams.map(s => s.name).mkString("(", ", ", ")")}")

val dynamicParamCols = getVectorParamMap.values.toList.map(col) match {
case Nil => Seq(lit(false).alias("placeholder"))
case l => l
Expand Down
8 changes: 4 additions & 4 deletions cognitive/src/main/scala/com/microsoft/ml/spark/cognitive/ComputerVision.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,8 @@ class RecognizeText(override val uid: String)
"printed text recognition is performed. If 'Handwritten' is specified," +
" handwriting recognition is performed",
{
case Left(_) => true
case Right(s) => Set("Printed", "Handwritten")(s)
case Left(s) => Set("Printed", "Handwritten")(s)
case Right(_) => true
}, isURLParam = true)

def getMode: String = getScalarParam(mode)
Expand Down Expand Up @@ -361,8 +361,8 @@ class ReadImage(override val uid: String)
" so only provide a language code if you would like to force the documented" +
" to be processed as that specific language.",
{
case Left(_) => true
case Right(s) => Set("en", "nl", "fr", "de", "it", "pt", "es")(s)
case Left(s) => Set("en", "nl", "fr", "de", "it", "pt", "es")(s)
case Right(_) => true
}, isURLParam = true)

def setLanguage(v: String): this.type = setScalarParam(language, v)
Expand Down
4 changes: 2 additions & 2 deletions cognitive/src/main/scala/com/microsoft/ml/spark/cognitive/FormRecognizer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ trait HasModelID extends HasServiceParams {
trait HasLocale extends HasServiceParams {
val locale = new ServiceParam[String](this, "locale", "Locale of the receipt. Supported" +
" locales: en-AU, en-CA, en-GB, en-IN, en-US.", {
case Left(_) => true
case Right(s) => Set("en-AU", "en-CA", "en-GB", "en-IN", "en-US")(s)
case Left(s) => Set("en-AU", "en-CA", "en-GB", "en-IN", "en-US")(s)
case Right(_) => true
}, isURLParam = true)

def setLocale(v: String): this.type = setScalarParam(locale, v)
Expand Down
6 changes: 6 additions & 0 deletions cognitive/src/main/scala/com/microsoft/ml/spark/cognitive/TextAnalytics.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,12 @@ abstract class TextAnalyticsBase(override val uid: String) extends CognitiveServ
override protected def getInternalTransformer(schema: StructType): PipelineModel = {
val dynamicParamColName = DatasetExtensions.findUnusedColumnName("dynamic", schema)

val missingRequiredParams = this.getRequiredParams.filter {
p => this.get(p).isEmpty && this.getDefault(p).isEmpty
}
assert(missingRequiredParams.isEmpty,
s"Missing required params: ${missingRequiredParams.map(s => s.name).mkString("(", ", ", ")")}")

def reshapeToArray(parameterName: String): Option[(Transformer, String, String)] = {
val reshapedColName = DatasetExtensions.findUnusedColumnName(parameterName, schema)
getVectorParamMap.get(parameterName).flatMap {
Expand Down
Loading