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

Jump to bottom

Fix restriction on maps/collections nesting #313

Merged
merged 2 commits into from
Aug 5, 2024
Merged

Fix restriction on maps/collections nesting #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5757e97
Fix restriction on maps/collections nesting
RRap0so Aug 2, 2024
87f4fbc
Merge branch 'master' of github.com:flyteorg/flytekit-java into sdkli…
RRap0so Aug 2, 2024
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
10 changes: 5 additions & 5 deletions flytekit-scala-tests/src/test/scala/org/flyte/flytekitscala/SdkLiteralTypesTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@ class TestOfReturnsProperTypeProvider extends ArgumentsProvider {
Arguments.of(
collections(maps(durations())),
of[List[Map[String, Duration]]]()
),
Arguments.of(
collections(maps(collections(maps(collections(strings()))))),
of[List[Map[String, List[Map[String, List[String]]]]]]()
)
)
}
Expand All @@ -142,11 +146,7 @@ class testOfThrowExceptionsForUnsupportedTypesProvider
Stream.of(
Arguments
.of("java type, must use java factory", () => of[java.lang.Long]()),
Arguments.of("not a supported type", () => of[Object]()),
Arguments.of(
"triple nesting not supported in of",
() => of[List[List[List[Long]]]]()
)
Arguments.of("not a supported type", () => of[Object]())
)
}
}
137 changes: 36 additions & 101 deletions flytekit-scala_2.13/src/main/scala/org/flyte/flytekitscala/SdkLiteralTypes.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ import scala.reflect.runtime.universe.{
TypeTag,
runtimeMirror,
termNames,
typeOf
typeOf,
typeTag
}
import scala.tools.nsc.doc.model.Trait

Expand Down Expand Up @@ -76,83 +77,12 @@ object SdkLiteralTypes {
case t if t <:< typeOf[Product] =>
generics().asInstanceOf[SdkLiteralType[T]]

case t if t =:= typeOf[List[Long]] =>
collections(integers()).asInstanceOf[SdkLiteralType[T]]
case t if t =:= typeOf[List[Double]] =>
collections(floats()).asInstanceOf[SdkLiteralType[T]]
case t if t =:= typeOf[List[String]] =>
collections(strings()).asInstanceOf[SdkLiteralType[T]]
case t if t =:= typeOf[List[Boolean]] =>
collections(booleans()).asInstanceOf[SdkLiteralType[T]]
case t if t =:= typeOf[List[Instant]] =>
collections(datetimes()).asInstanceOf[SdkLiteralType[T]]
case t if t =:= typeOf[List[Duration]] =>
collections(durations()).asInstanceOf[SdkLiteralType[T]]

case t if t =:= typeOf[Map[String, Long]] =>
maps(integers()).asInstanceOf[SdkLiteralType[T]]
case t if t =:= typeOf[Map[String, Double]] =>
maps(floats()).asInstanceOf[SdkLiteralType[T]]
case t if t =:= typeOf[Map[String, String]] =>
maps(strings()).asInstanceOf[SdkLiteralType[T]]
case t if t =:= typeOf[Map[String, Boolean]] =>
maps(booleans()).asInstanceOf[SdkLiteralType[T]]
case t if t =:= typeOf[Map[String, Instant]] =>
maps(datetimes()).asInstanceOf[SdkLiteralType[T]]
case t if t =:= typeOf[Map[String, Duration]] =>
maps(durations()).asInstanceOf[SdkLiteralType[T]]

case t if t =:= typeOf[List[List[Long]]] =>
collections(collections(integers())).asInstanceOf[SdkLiteralType[T]]
case t if t =:= typeOf[List[List[Double]]] =>
collections(collections(floats())).asInstanceOf[SdkLiteralType[T]]
case t if t =:= typeOf[List[List[String]]] =>
collections(collections(strings())).asInstanceOf[SdkLiteralType[T]]
case t if t =:= typeOf[List[List[Boolean]]] =>
collections(collections(booleans())).asInstanceOf[SdkLiteralType[T]]
case t if t =:= typeOf[List[List[Instant]]] =>
collections(collections(datetimes())).asInstanceOf[SdkLiteralType[T]]
case t if t =:= typeOf[List[List[Duration]]] =>
collections(collections(durations())).asInstanceOf[SdkLiteralType[T]]

case t if t =:= typeOf[List[Map[String, Long]]] =>
collections(maps(integers())).asInstanceOf[SdkLiteralType[T]]
case t if t =:= typeOf[List[Map[String, Double]]] =>
collections(maps(floats())).asInstanceOf[SdkLiteralType[T]]
case t if t =:= typeOf[List[Map[String, String]]] =>
collections(maps(strings())).asInstanceOf[SdkLiteralType[T]]
case t if t =:= typeOf[List[Map[String, Boolean]]] =>
collections(maps(booleans())).asInstanceOf[SdkLiteralType[T]]
case t if t =:= typeOf[List[Map[String, Instant]]] =>
collections(maps(datetimes())).asInstanceOf[SdkLiteralType[T]]
case t if t =:= typeOf[List[Map[String, Duration]]] =>
collections(maps(durations())).asInstanceOf[SdkLiteralType[T]]

case t if t =:= typeOf[Map[String, Map[String, Long]]] =>
maps(maps(integers())).asInstanceOf[SdkLiteralType[T]]
case t if t =:= typeOf[Map[String, Map[String, Double]]] =>
maps(maps(floats())).asInstanceOf[SdkLiteralType[T]]
case t if t =:= typeOf[Map[String, Map[String, String]]] =>
maps(maps(strings())).asInstanceOf[SdkLiteralType[T]]
case t if t =:= typeOf[Map[String, Map[String, Boolean]]] =>
maps(maps(booleans())).asInstanceOf[SdkLiteralType[T]]
case t if t =:= typeOf[Map[String, Map[String, Instant]]] =>
maps(maps(datetimes())).asInstanceOf[SdkLiteralType[T]]
case t if t =:= typeOf[Map[String, Map[String, Duration]]] =>
maps(maps(durations())).asInstanceOf[SdkLiteralType[T]]

case t if t =:= typeOf[Map[String, List[Long]]] =>
maps(collections(integers())).asInstanceOf[SdkLiteralType[T]]
case t if t =:= typeOf[Map[String, List[Double]]] =>
maps(collections(floats())).asInstanceOf[SdkLiteralType[T]]
case t if t =:= typeOf[Map[String, List[String]]] =>
maps(collections(strings())).asInstanceOf[SdkLiteralType[T]]
case t if t =:= typeOf[Map[String, List[Boolean]]] =>
maps(collections(booleans())).asInstanceOf[SdkLiteralType[T]]
case t if t =:= typeOf[Map[String, List[Instant]]] =>
maps(collections(datetimes())).asInstanceOf[SdkLiteralType[T]]
case t if t =:= typeOf[Map[String, List[Duration]]] =>
maps(collections(durations())).asInstanceOf[SdkLiteralType[T]]
case t if t <:< typeOf[List[Any]] =>
collections(of()(createTypeTag(typeTag[T].mirror, t.typeArgs.head)))
.asInstanceOf[SdkLiteralType[T]]
case t if t <:< typeOf[Map[String, Any]] =>
maps(of()(createTypeTag(typeTag[T].mirror, t.typeArgs.last)))
.asInstanceOf[SdkLiteralType[T]]

case _ =>
throw new IllegalArgumentException(s"Unsupported type: ${typeOf[T]}")
Expand Down Expand Up @@ -342,7 +272,7 @@ object SdkLiteralTypes {
)
}
} else if (tpe <:< typeOf[Product]) {
val typeTag = createTypeTag(tpe)
val typeTag = createTypeTag(mirror, tpe)
val classTag = ClassTag(
typeTag.mirror.runtimeClass(tpe)
)
Expand All @@ -357,6 +287,7 @@ object SdkLiteralTypes {
// In this case, we use the __TYPE field to get the type of the product.
case map: Map[String, Any] if map.contains(__TYPE) =>
val typeTag = createTypeTag(
mirror,
mirror
.staticClass(map(__TYPE).asInstanceOf[String])
.typeSignature
Expand All @@ -370,27 +301,7 @@ object SdkLiteralTypes {
}
}

def createTypeTag[U <: Product](tpe: Type): TypeTag[U] = {
val typSym = mirror.staticClass(tpe.typeSymbol.fullName)
// note: this uses internal API, otherwise we will need to depend on scala-compiler at runtime
val typeRef =
universe.internal.typeRef(NoPrefix, typSym, List.empty)

TypeTag(
mirror,
new TypeCreator {
override def apply[V <: Universe with Singleton](
m: Mirror[V]
): V#Type = {
assert(
m == mirror,
s"TypeTag[$typeRef] defined in $mirror cannot be migrated to $m."
)
typeRef.asInstanceOf[V#Type]
}
}
)
}
val clazz = typeOf[S].typeSymbol.asClass

def instantiateViaConstructor(cls: ClassSymbol): S = {
val classMirror = mirror.reflectClass(cls)
Expand All @@ -412,7 +323,6 @@ object SdkLiteralTypes {
constructorMirror(constructorArgs: _*).asInstanceOf[S]
}

val clazz = typeOf[S].typeSymbol.asClass
// special handling of scala.Option as it is a Product, but can't be instantiated like common
// case classes
if (clazz.name.toString == "Option")
Expand Down Expand Up @@ -513,6 +423,31 @@ object SdkLiteralTypes {

override def toString: String = s"map of [$valuesType]"
}

private def createTypeTag[U](
mirror: universe.Mirror,
tpe: Type
): TypeTag[U] = {
val typSym = mirror.staticClass(tpe.typeSymbol.fullName)
// note: this uses internal API, otherwise we will need to depend on scala-compiler at runtime
val typeRef =
universe.internal.typeRef(NoPrefix, typSym, tpe.typeArgs)

TypeTag(
mirror,
new TypeCreator {
override def apply[V <: Universe with Singleton](
m: Mirror[V]
): V#Type = {
assert(
m == mirror,
s"TypeTag[$typeRef] defined in $mirror cannot be migrated to $m."
)
typeRef.asInstanceOf[V#Type]
}
}
)
}
}

private object ScalaLiteralType {
Expand Down
Loading