@finos/legend-application-data-cube 0.7.8 → 0.7.9

package/lib/stores/model/LakehouseProducerDataCubeSource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LakehouseProducerDataCubeSource.d.ts","sourceRoot":"","sources":["../../../src/stores/model/LakehouseProducerDataCubeSource.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EACL,oBAAoB,EAGpB,KAAK,WAAW,EACjB,MAAM,sBAAsB,CAAC;AAG9B,eAAO,MAAM,wCAAwC,sBAAsB,CAAC;AAE5E,qBAAa,+BAAgC,SAAQ,cAAc;IACjE,KAAK,EAAG,WAAW,CAAC,uBAAuB,CAAC,CAAC;IAC7C,OAAO,EAAG,MAAM,CAAC;IACjB,KAAK,EAAG,MAAM,EAAE,CAAC;IACjB,SAAS,EAAG,MAAM,CAAC;CACpB;AAED,qBAAa,4CAA6C,SAAQ,cAAc;IAC9E,KAAK,EAAG,WAAW,CAAC,uBAAuB,CAAC,CAAC;IAC7C,OAAO,EAAG,MAAM,CAAC;IACjB,EAAE,EAAG,MAAM,CAAC;IACZ,MAAM,EAAG,MAAM,CAAC;IAChB,KAAK,EAAG,MAAM,CAAC;IACf,KAAK,EAAG,MAAM,EAAE,CAAC;CAClB;AAED,qBAAa,aAAa;IACxB,UAAU,EAAG,MAAM,CAAC;IACpB,UAAU,EAAG,MAAM,CAAC;IAEpB,MAAM,CAAC,QAAQ,CAAC,aAAa,sCAK3B;CACH;AAED,qBAAa,kCAAkC;IAC7C,mBAAmB,EAAG,MAAM,CAAC;IAC7B,SAAS,EAAG,MAAM,CAAC;IACnB,eAAe,EAAG,MAAM,CAAC;IACzB,KAAK,EAAG,MAAM,EAAE,CAAC;IACjB,aAAa,CAAC,EAAE,aAAa,CAAC;IAE9B,MAAM,CAAC,QAAQ,CAAC,aAAa,2DAW3B;CACH"}
+{"version":3,"file":"LakehouseProducerDataCubeSource.d.ts","sourceRoot":"","sources":["../../../src/stores/model/LakehouseProducerDataCubeSource.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EACL,oBAAoB,EAGpB,KAAK,WAAW,EACjB,MAAM,sBAAsB,CAAC;AAG9B,eAAO,MAAM,wCAAwC,sBAAsB,CAAC;AAE5E,qBAAa,+BAAgC,SAAQ,cAAc;IACjE,KAAK,EAAG,WAAW,CAAC,uBAAuB,CAAC,CAAC;IAC7C,OAAO,EAAG,MAAM,CAAC;IACjB,KAAK,EAAG,MAAM,EAAE,CAAC;IACjB,SAAS,EAAG,MAAM,CAAC;CACpB;AAED,qBAAa,4CAA6C,SAAQ,cAAc;IAC9E,KAAK,EAAG,WAAW,CAAC,uBAAuB,CAAC,CAAC;IAC7C,OAAO,EAAG,MAAM,CAAC;IACjB,EAAE,EAAG,MAAM,CAAC;IACZ,MAAM,EAAG,MAAM,CAAC;IAChB,KAAK,EAAG,MAAM,CAAC;IACf,KAAK,EAAG,MAAM,EAAE,CAAC;CAClB;AAED,qBAAa,aAAa;IACxB,UAAU,EAAG,MAAM,CAAC;IAEpB,MAAM,CAAC,QAAQ,CAAC,aAAa,sCAI3B;CACH;AAED,qBAAa,kCAAkC;IAC7C,mBAAmB,EAAG,MAAM,CAAC;IAC7B,SAAS,EAAG,MAAM,CAAC;IACnB,eAAe,EAAG,MAAM,CAAC;IACzB,KAAK,EAAG,MAAM,EAAE,CAAC;IACjB,aAAa,CAAC,EAAE,aAAa,CAAC;IAE9B,MAAM,CAAC,QAAQ,CAAC,aAAa,2DAW3B;CACH"}

package/lib/stores/model/LakehouseProducerDataCubeSource.js

@@ -33,10 +33,8 @@ export class LakehouseProducerIcebergCachedDataCubeSource extends DataCubeSource
 }
 export class IcebergConfig {
     catalogUrl;
-    icebergRef;
     static serialization = new SerializationFactory(createModelSchema(IcebergConfig, {
         catalogUrl: primitive(),
-        icebergRef: primitive(),
     }));
 }
 export class RawLakehouseProducerDataCubeSource {

package/lib/stores/model/LakehouseProducerDataCubeSource.js.map

@@ -1 +1 @@
-{"version":3,"file":"LakehouseProducerDataCubeSource.js","sourceRoot":"","sources":["../../../src/stores/model/LakehouseProducerDataCubeSource.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzD,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACxB,gBAAgB,GAEjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEzE,MAAM,CAAC,MAAM,wCAAwC,GAAG,mBAAmB,CAAC;AAE5E,MAAM,OAAO,+BAAgC,SAAQ,cAAc;IACjE,KAAK,CAAwC;IAC7C,OAAO,CAAU;IACjB,KAAK,CAAY;IACjB,SAAS,CAAU;CACpB;AAED,MAAM,OAAO,4CAA6C,SAAQ,cAAc;IAC9E,KAAK,CAAwC;IAC7C,OAAO,CAAU;IACjB,EAAE,CAAU;IACZ,MAAM,CAAU;IAChB,KAAK,CAAU;IACf,KAAK,CAAY;CAClB;AAED,MAAM,OAAO,aAAa;IACxB,UAAU,CAAU;IACpB,UAAU,CAAU;IAEpB,MAAM,CAAU,aAAa,GAAG,IAAI,oBAAoB,CACtD,iBAAiB,CAAC,aAAa,EAAE;QAC/B,UAAU,EAAE,SAAS,EAAE;QACvB,UAAU,EAAE,SAAS,EAAE;KACxB,CAAC,CACH,CAAC;;AAGJ,MAAM,OAAO,kCAAkC;IAC7C,mBAAmB,CAAU;IAC7B,SAAS,CAAU;IACnB,eAAe,CAAU;IACzB,KAAK,CAAY;IACjB,aAAa,CAAiB;IAE9B,MAAM,CAAU,aAAa,GAAG,IAAI,oBAAoB,CACtD,iBAAiB,CAAC,kCAAkC,EAAE;QACpD,KAAK,EAAE,wBAAwB,CAAC,wCAAwC,CAAC;QACzE,mBAAmB,EAAE,SAAS,EAAE;QAChC,SAAS,EAAE,SAAS,EAAE;QACtB,eAAe,EAAE,SAAS,EAAE;QAC5B,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC;QACxB,aAAa,EAAE,QAAQ,CACrB,gBAAgB,CAAC,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,CACrD;KACF,CAAC,CACH,CAAC"}
+{"version":3,"file":"LakehouseProducerDataCubeSource.js","sourceRoot":"","sources":["../../../src/stores/model/LakehouseProducerDataCubeSource.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzD,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACxB,gBAAgB,GAEjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEzE,MAAM,CAAC,MAAM,wCAAwC,GAAG,mBAAmB,CAAC;AAE5E,MAAM,OAAO,+BAAgC,SAAQ,cAAc;IACjE,KAAK,CAAwC;IAC7C,OAAO,CAAU;IACjB,KAAK,CAAY;IACjB,SAAS,CAAU;CACpB;AAED,MAAM,OAAO,4CAA6C,SAAQ,cAAc;IAC9E,KAAK,CAAwC;IAC7C,OAAO,CAAU;IACjB,EAAE,CAAU;IACZ,MAAM,CAAU;IAChB,KAAK,CAAU;IACf,KAAK,CAAY;CAClB;AAED,MAAM,OAAO,aAAa;IACxB,UAAU,CAAU;IAEpB,MAAM,CAAU,aAAa,GAAG,IAAI,oBAAoB,CACtD,iBAAiB,CAAC,aAAa,EAAE;QAC/B,UAAU,EAAE,SAAS,EAAE;KACxB,CAAC,CACH,CAAC;;AAGJ,MAAM,OAAO,kCAAkC;IAC7C,mBAAmB,CAAU;IAC7B,SAAS,CAAU;IACnB,eAAe,CAAU;IACzB,KAAK,CAAY;IACjB,aAAa,CAAiB;IAE9B,MAAM,CAAU,aAAa,GAAG,IAAI,oBAAoB,CACtD,iBAAiB,CAAC,kCAAkC,EAAE;QACpD,KAAK,EAAE,wBAAwB,CAAC,wCAAwC,CAAC;QACzE,mBAAmB,EAAE,SAAS,EAAE;QAChC,SAAS,EAAE,SAAS,EAAE;QACtB,eAAe,EAAE,SAAS,EAAE;QAC5B,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC;QACxB,aAAa,EAAE,QAAQ,CACrB,gBAAgB,CAAC,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,CACrD;KACF,CAAC,CACH,CAAC"}

package/lib/stores/model/SecondaryOauthClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SecondaryOauthClient.d.ts","sourceRoot":"","sources":["../../../src/stores/model/SecondaryOauthClient.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAEL,KAAK,mBAAmB,EAGzB,MAAM,gBAAgB,CAAC;AAExB,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,IAAI,CAAqB;gBAErB,MAAM,EAAE,mBAAmB;IAQvC,2CAA2C;IAC9B,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC;CAczC"}
+{"version":3,"file":"SecondaryOauthClient.d.ts","sourceRoot":"","sources":["../../../src/stores/model/SecondaryOauthClient.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAEL,KAAK,mBAAmB,EAGzB,MAAM,gBAAgB,CAAC;AAExB,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,IAAI,CAAqB;gBAErB,MAAM,EAAE,mBAAmB;IAQvC,2CAA2C;IAC9B,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC;CAczC"}

package/lib/stores/model/SecondaryOauthClient.js

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { guaranteeNonNullable } from '@finos/legend-shared';
 import { UserManager, WebStorageStateStore, } from 'oidc-client-ts';
 export class SecondaryOAuthClient {
     userManager;
@@ -33,11 +34,11 @@ export class SecondaryOAuthClient {
                 return this.user.access_token;
             }
             else {
-                this.user = await this.userManager.signinPopup();
+                this.user = guaranteeNonNullable(await this.userManager.signinSilent());
                 return this.user.access_token;
             }
         }
-        this.user = await this.userManager.signinPopup();
+        this.user = guaranteeNonNullable(await this.userManager.signinSilent());
         return this.user.access_token;
     }
 }

package/lib/stores/model/SecondaryOauthClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"SecondaryOauthClient.js","sourceRoot":"","sources":["../../../src/stores/model/SecondaryOauthClient.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,WAAW,EAGX,oBAAoB,GACrB,MAAM,gBAAgB,CAAC;AAExB,MAAM,OAAO,oBAAoB;IACvB,WAAW,CAAc;IACzB,IAAI,GAAgB,IAAI,CAAC;IAEjC,YAAY,MAA2B;QACrC,IAAI,CAAC,WAAW,GAAG,IAAI,WAAW,CAAC;YACjC,GAAG,MAAM;YACT,SAAS,EAAE,IAAI,oBAAoB,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC;YACnE,KAAK,EAAE,MAAM,CAAC,gBAAgB,EAAE,KAAe;SAChD,CAAC,CAAC;IACL,CAAC;IAED,2CAA2C;IACpC,KAAK,CAAC,QAAQ;QACnB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC;QAC5D,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YACnE,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,CAAC;gBACtC,OAAO,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC;YAChC,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC;gBACjD,OAAO,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC;YAChC,CAAC;QACH,CAAC;QACD,IAAI,CAAC,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC;QACjD,OAAO,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC;IAChC,CAAC;CACF"}
+{"version":3,"file":"SecondaryOauthClient.js","sourceRoot":"","sources":["../../../src/stores/model/SecondaryOauthClient.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EACL,WAAW,EAGX,oBAAoB,GACrB,MAAM,gBAAgB,CAAC;AAExB,MAAM,OAAO,oBAAoB;IACvB,WAAW,CAAc;IACzB,IAAI,GAAgB,IAAI,CAAC;IAEjC,YAAY,MAA2B;QACrC,IAAI,CAAC,WAAW,GAAG,IAAI,WAAW,CAAC;YACjC,GAAG,MAAM;YACT,SAAS,EAAE,IAAI,oBAAoB,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC;YACnE,KAAK,EAAE,MAAM,CAAC,gBAAgB,EAAE,KAAe;SAChD,CAAC,CAAC;IACL,CAAC;IAED,2CAA2C;IACpC,KAAK,CAAC,QAAQ;QACnB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC;QAC5D,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YACnE,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,CAAC;gBACtC,OAAO,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC;YAChC,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,IAAI,GAAG,oBAAoB,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC,CAAC;gBACxE,OAAO,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC;YAChC,CAAC;QACH,CAAC;QACD,IAAI,CAAC,IAAI,GAAG,oBAAoB,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC,CAAC;QACxE,OAAO,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC;IAChC,CAAC;CACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-application-data-cube",
-  "version": "0.7.8",
+  "version": "0.7.9",
   "description": "Legend DataCube application core",
   "keywords": [
     "legend",
@@ -45,12 +45,12 @@
     "@duckdb/duckdb-wasm": "1.31.0",
     "@finos/legend-application": "16.0.76",
     "@finos/legend-art": "7.1.127",
-    "@finos/legend-code-editor": "2.0.127",
-    "@finos/legend-data-cube": "0.3.37",
-    "@finos/legend-graph": "32.3.8",
-    "@finos/legend-query-builder": "4.17.50",
+    "@finos/legend-code-editor": "2.0.128",
+    "@finos/legend-data-cube": "0.3.38",
+    "@finos/legend-graph": "32.3.9",
+    "@finos/legend-query-builder": "4.17.51",
     "@finos/legend-server-depot": "6.1.1",
-    "@finos/legend-server-lakehouse": "0.3.8",
+    "@finos/legend-server-lakehouse": "0.3.9",
     "@finos/legend-shared": "11.0.20",
     "@finos/legend-storage": "3.0.139",
     "@types/react": "19.0.10",

package/src/components/LegendDataCubeWebApplication.tsx

@@ -51,10 +51,12 @@ const LegendDataCubeWebApplicationRouter = observer(() => {
   useEffect(() => {
     if (auth.user?.access_token) {
       authStore.setAccessToken(auth.user.access_token);
+      authStore.setUserManagerSettings(auth.settings);
     } else {
       authStore.setAccessToken(undefined);
+      authStore.setUserManagerSettings(undefined);
     }
-  }, [auth.user]);
+  }, [auth]);
 
   return (
     <div className="h-full">

package/src/components/builder/source/LakehouseProducerDataCubeSourceBuilder.tsx

@@ -42,10 +42,6 @@ export const LakehouseProducerDataCubeSourceBuilder: React.FC<{
     state.reset();
   }, [state]);
 
-  useEffect(() => {
-    state.setUserManagerSettings(auth.settings);
-  }, [state, auth]);
-
   function createUrnPairs(
     urns: string[],
   ): Record<string, string | undefined>[] {

package/src/components/builder/source/LegendDataCubeSourceLoader.tsx

@@ -23,8 +23,6 @@ import { DataCubeIcon } from '@finos/legend-art';
 import { formatDistanceToNow } from '@finos/legend-shared';
 import type { LegendDataCubeSourceLoaderState } from '../../../stores/builder/source/LegendDataCubeSourceLoaderState.js';
 import { LegendDataCubeBlockingWindow } from '../../LegendDataCubeBlockingWindow.js';
-import type { LakehouseProducerDataCubeSourceLoaderState } from '../../../stores/builder/source/LakehouseProducerDataCubeSourceLoaderState.js';
-import { LakehouseProducerDataCubeSourceLoader } from './LakehouseProducerDataCubeSourceLoader.js';
 import { LegendDataCubeSourceBuilderType } from '../../../stores/builder/source/LegendDataCubeSourceBuilderState.js';
 
 export const LegendDataCubeSourceLoader = observer(
@@ -90,14 +88,6 @@ export const LegendDataCubeSourceLoader = observer(
                     }
                   />
                 )}
-                {state.label ===
-                  LegendDataCubeSourceBuilderType.LAKEHOUSE_PRODUCER && (
-                  <LakehouseProducerDataCubeSourceLoader
-                    partialSourceLoader={
-                      state as LakehouseProducerDataCubeSourceLoaderState
-                    }
-                  />
-                )}
               </div>
             </div>
           </div>

package/src/stores/AuthStore.ts

@@ -15,9 +15,11 @@
  * limitations under the License.
  */
 import { makeAutoObservable } from 'mobx';
+import type { UserManagerSettings } from 'oidc-client-ts';
 
 class AuthStore {
   accessToken: string | undefined = undefined;
+  userManagerSettings: UserManagerSettings | undefined = undefined;
   constructor() {
     makeAutoObservable(this);
   }
@@ -27,6 +29,12 @@ class AuthStore {
   getAccessToken(): string | undefined {
     return this.accessToken;
   }
+  setUserManagerSettings(settings?: UserManagerSettings) {
+    this.userManagerSettings = settings;
+  }
+  getUserManagerSettings(): UserManagerSettings | undefined {
+    return this.userManagerSettings;
+  }
 }
 
 export const authStore = new AuthStore();

package/src/stores/LegendDataCubeBaseStore.ts

@@ -163,6 +163,7 @@ export class LegendDataCubeBaseStore {
       this.depotServerClient,
       this.engineServerClient,
       this.lakehouseContractServerClient,
+      this.lakehouseIngestServerClient,
       this.graphManager,
     );
     this.taskService = new DataCubeTaskService();

package/src/stores/LegendDataCubeDataCubeEngine.ts

@@ -172,24 +172,29 @@ import {
 import {
   isEnvNameCompatibleWithEntitlementsLakehouseEnvironmentType,
   type LakehouseContractServerClient,
+  type LakehouseIngestServerClient,
 } from '@finos/legend-server-lakehouse';
 import { authStore } from './AuthStore.js';
 import { extractEntityNameFromPath } from '@finos/legend-storage';
+import { SecondaryOAuthClient } from './model/SecondaryOauthClient.js';
 
 export class LegendDataCubeDataCubeEngine extends DataCubeEngine {
   private readonly _application: LegendDataCubeApplicationStore;
   private readonly _depotServerClient: DepotServerClient;
   private readonly _engineServerClient: V1_EngineServerClient;
   private readonly _lakehouseContractServerClient: LakehouseContractServerClient;
+  private readonly _lakehouseIngestServerClient: LakehouseIngestServerClient;
   private readonly _graphManager: V1_PureGraphManager;
   private readonly _duckDBEngine: LegendDataCubeDuckDBEngine;
-  private _ingestDefinition: PlainObject | undefined;
+  private _secondaryOauthClient?: SecondaryOAuthClient;
+  private LAKEHOUSE_SECTION = '###Lakehouse';
 
   constructor(
     application: LegendDataCubeApplicationStore,
     depotServerClient: DepotServerClient,
     engineServerClient: V1_EngineServerClient,
     lakehouseContractServerClient: LakehouseContractServerClient,
+    lakehouseIngestServerClient: LakehouseIngestServerClient,
     graphManager: V1_PureGraphManager,
   ) {
     super();
@@ -199,9 +204,19 @@ export class LegendDataCubeDataCubeEngine extends DataCubeEngine {
     this._engineServerClient = engineServerClient;
     this._graphManager = graphManager;
     this._lakehouseContractServerClient = lakehouseContractServerClient;
+    this._lakehouseIngestServerClient = lakehouseIngestServerClient;
     this._duckDBEngine = new LegendDataCubeDuckDBEngine();
   }
 
+  private get secondaryOauthClient(): SecondaryOAuthClient {
+    if (!this._secondaryOauthClient) {
+      this._secondaryOauthClient = new SecondaryOAuthClient(
+        guaranteeNonNullable(authStore.getUserManagerSettings()),
+      );
+    }
+    return this._secondaryOauthClient;
+  }
+
   async initialize() {
     await this._duckDBEngine.initialize();
   }
@@ -720,13 +735,15 @@ export class LegendDataCubeDataCubeEngine extends DataCubeEngine {
         const rawSource =
           RawLakehouseProducerDataCubeSource.serialization.fromJson(value);
 
-        if (
-          rawSource.icebergConfig?.icebergRef &&
-          rawSource.icebergConfig.catalogUrl
-        ) {
+        if (rawSource.icebergConfig?.catalogUrl) {
           const source = new LakehouseProducerIcebergCachedDataCubeSource();
+          const refId = await this._duckDBEngine.ingestIcebergTable(
+            rawSource.warehouse,
+            rawSource.paths,
+            await this.secondaryOauthClient.getToken(),
+          );
           const tableCatalog = this._duckDBEngine.retrieveCatalogTable(
-            rawSource.icebergConfig.icebergRef,
+            refId.dbReference,
           );
           source.paths = rawSource.paths;
 
@@ -784,7 +801,7 @@ export class LegendDataCubeDataCubeEngine extends DataCubeEngine {
           query.value = ingestAccesor;
           source.query = query;
 
-          const model = this._synthesizeLakehouseProducerPMCD(
+          const model = await this._synthesizeLakehouseProducerPMCD(
             rawSource,
             source,
           );
@@ -1335,12 +1352,6 @@ export class LegendDataCubeDataCubeEngine extends DataCubeEngine {
     return this._engineServerClient.grammarToJSON_model(code);
   }
 
-  // ---------------------------------- INGEST ---------------------------------------
-
-  registerIngestDefinition(ingestDefinition: PlainObject | undefined) {
-    this._ingestDefinition = ingestDefinition;
-  }
-
   // ---------------------------------- CACHING --------------------------------------
 
   override async initializeCache(
@@ -1707,14 +1718,12 @@ export class LegendDataCubeDataCubeEngine extends DataCubeEngine {
     warehouse: string,
     paths: string[],
     catalogApi: string,
-    refId?: string,
     token?: string,
   ) {
     const { dbReference } = await this._duckDBEngine.ingestIcebergTable(
       warehouse,
       paths,
       catalogApi,
-      refId,
       token,
     );
     return { dbReference };
@@ -1839,7 +1848,7 @@ export class LegendDataCubeDataCubeEngine extends DataCubeEngine {
     };
   }
 
-  private _synthesizeLakehouseProducerPMCD(
+  private async _synthesizeLakehouseProducerPMCD(
     rawSource: RawLakehouseProducerDataCubeSource,
     source: LakehouseProducerDataCubeSource,
   ) {
@@ -1859,7 +1868,27 @@ export class LegendDataCubeDataCubeEngine extends DataCubeEngine {
 
     const model = new V1_PureModelContextData();
     const ingestDefinition = new V1_IngestDefinition();
-    ingestDefinition.content = this._ingestDefinition as PlainObject;
+    // call the API
+    const ingestGrammar =
+      await this._lakehouseIngestServerClient.getIngestDefinitionGrammar(
+        rawSource.ingestDefinitionUrn,
+        rawSource.ingestServerUrl,
+        authStore.getAccessToken(),
+      );
+
+    const ingestPMCDPlainObject = await this.parseCompatibleModel(
+      `${this.LAKEHOUSE_SECTION}\n${ingestGrammar}`,
+    );
+
+    const ingestDefPMCD = guaranteeType(
+      V1_deserializePureModelContext(ingestPMCDPlainObject),
+      V1_PureModelContextData,
+    );
+
+    const ingestDefinitionObject = (
+      ingestDefPMCD.elements.at(0) as V1_IngestDefinition
+    ).content;
+    ingestDefinition.content = ingestDefinitionObject;
     const splits = rawSource.paths[0]?.split('::');
     ingestDefinition.name = guaranteeNonNullable(splits?.pop());
     ingestDefinition.package = guaranteeNonNullable(

package/src/stores/LegendDataCubeDuckDBEngine.ts

@@ -272,16 +272,8 @@ export class LegendDataCubeDuckDBEngine {
     warehouse: string,
     paths: string[],
     catalogApi: string,
-    refId?: string,
     token?: string,
   ) {
-    if (!isNullable(refId) && this._catalog.has(refId)) {
-      guaranteeNonNullable(this._catalog.get(refId));
-      return {
-        dbReference: refId,
-      };
-    }
-
     const schemaName = LegendDataCubeDuckDBEngine.DUCKDB_DEFAULT_SCHEMA_NAME;
     LegendDataCubeDuckDBEngine.ingestFileTableCounter += 1;
     const tableName = `${LegendDataCubeDuckDBEngine.INGEST_TABLE_NAME_PREFIX}${LegendDataCubeDuckDBEngine.ingestFileTableCounter}`;
@@ -322,7 +314,7 @@ export class LegendDataCubeDuckDBEngine {
       ]);
     await connection.close();
 
-    const ref = isNullable(refId) ? uuid() : refId;
+    const ref = uuid();
     this._catalog.set(ref, {
       schemaName,
       tableName,

package/src/stores/builder/LegendDataCubeBuilderStore.tsx

@@ -75,8 +75,6 @@ import type {
   LakehouseIngestServerClient,
   LakehousePlatformServerClient,
 } from '@finos/legend-server-lakehouse';
-import { LAKEHOUSE_PRODUCER_DATA_CUBE_SOURCE_TYPE } from '../model/LakehouseProducerDataCubeSource.js';
-import { LakehouseProducerDataCubeSourceLoaderState } from './source/LakehouseProducerDataCubeSourceLoaderState.js';
 
 export class LegendDataCubeBuilderState {
   readonly uuid = uuid();
@@ -349,16 +347,6 @@ export class LegendDataCubeBuilderStore {
           onSuccess,
           onError,
         );
-      case LAKEHOUSE_PRODUCER_DATA_CUBE_SOURCE_TYPE:
-        return new LakehouseProducerDataCubeSourceLoaderState(
-          this.application,
-          this.engine,
-          this.alertService,
-          sourceData,
-          persistentDataCube,
-          onSuccess,
-          onError,
-        );
       default:
         throw new UnsupportedOperationError(
           `Can't create source loader for unsupported type '${sourceData._type}'`,

package/src/stores/builder/source/LakehouseProducerDataCubeSourceBuilderState.ts

@@ -47,8 +47,6 @@ import {
   V1_deserializePureModelContext,
   V1_PureModelContextData,
 } from '@finos/legend-graph';
-import type { UserManagerSettings } from 'oidc-client-ts';
-import { SecondaryOAuthClient } from '../../model/SecondaryOauthClient.js';
 
 export class LakehouseProducerDataCubeSourceBuilderState extends LegendDataCubeSourceBuilderState {
   deploymentId: number | undefined;
@@ -67,8 +65,6 @@ export class LakehouseProducerDataCubeSourceBuilderState extends LegendDataCubeS
   catalogUrl: string | undefined;
   milestoning: boolean;
 
-  userManagerSettings: UserManagerSettings | undefined;
-
   private LAKEHOUSE_SECTION = '###Lakehouse';
 
   readonly _platformServerClient: LakehousePlatformServerClient;
@@ -147,10 +143,6 @@ export class LakehouseProducerDataCubeSourceBuilderState extends LegendDataCubeS
     this.enableIceberg = enable;
   }
 
-  setUserManagerSettings(settings: UserManagerSettings) {
-    this.userManagerSettings = settings;
-  }
-
   async fetchIngestUrns(access_token: string | undefined) {
     //TODO: we should retry this method if access token is invalid
     this.resetDeployment(this.deploymentId);
@@ -337,35 +329,18 @@ export class LakehouseProducerDataCubeSourceBuilderState extends LegendDataCubeS
   }
 
   override async generateSourceData(): Promise<PlainObject> {
-    // register ingest definition
-
     const rawSource = new RawLakehouseProducerDataCubeSource();
     // build data cube source
     if (this.enableIceberg) {
-      const oauthClient = new SecondaryOAuthClient(
-        guaranteeNonNullable(this.userManagerSettings),
-      );
       this.milestoning =
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         (this.ingestDefinition as any).writeMode._type === 'batch_milestoned';
       this.createIcebergPath();
       const icebergConfig = new IcebergConfig();
       icebergConfig.catalogUrl = guaranteeNonNullable(this.catalogUrl);
-
-      const token = await oauthClient.getToken();
-
-      const refId = await this._engine.ingestIcebergTable(
-        guaranteeNonNullable(this.warehouse),
-        this.paths,
-        guaranteeNonNullable(this.catalogUrl),
-        undefined,
-        token,
-      );
-      icebergConfig.icebergRef = refId.dbReference;
       rawSource.icebergConfig = icebergConfig;
     } else {
       this.createPath();
-      this._engine.registerIngestDefinition(this.ingestDefinition);
     }
     rawSource.ingestDefinitionUrn = guaranteeNonNullable(
       this.selectedIngestUrn,

package/src/stores/model/LakehouseProducerDataCubeSource.ts

@@ -44,12 +44,10 @@ export class LakehouseProducerIcebergCachedDataCubeSource extends DataCubeSource
 
 export class IcebergConfig {
   catalogUrl!: string;
-  icebergRef!: string;
 
   static readonly serialization = new SerializationFactory(
     createModelSchema(IcebergConfig, {
       catalogUrl: primitive(),
-      icebergRef: primitive(),
     }),
   );
 }

package/src/stores/model/SecondaryOauthClient.ts

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import { guaranteeNonNullable } from '@finos/legend-shared';
 import {
   UserManager,
   type UserManagerSettings,
@@ -41,11 +42,11 @@ export class SecondaryOAuthClient {
       if (Date.now() < exp - 10 * 60 * 1000) {
         return this.user.access_token;
       } else {
-        this.user = await this.userManager.signinPopup();
+        this.user = guaranteeNonNullable(await this.userManager.signinSilent());
         return this.user.access_token;
       }
     }
-    this.user = await this.userManager.signinPopup();
+    this.user = guaranteeNonNullable(await this.userManager.signinSilent());
     return this.user.access_token;
   }
 }

package/tsconfig.json

@@ -70,7 +70,6 @@
     "./src/stores/builder/source/FreeformTDSExpressionDataCubeSourceBuilderState.ts",
     "./src/stores/builder/source/LakehouseConsumerDataCubeSourceBuilderState.ts",
     "./src/stores/builder/source/LakehouseProducerDataCubeSourceBuilderState.ts",
-    "./src/stores/builder/source/LakehouseProducerDataCubeSourceLoaderState.ts",
     "./src/stores/builder/source/LegendDataCubeSourceBuilderState.ts",
     "./src/stores/builder/source/LegendQueryDataCubeSourceBuilderState.ts",
     "./src/stores/builder/source/LegendQueryDataCubeSourceBuilderStateHelper.ts",
@@ -98,7 +97,6 @@
     "./src/components/builder/source/FreeformTDSExpressionDataCubeSourceBuilder.tsx",
     "./src/components/builder/source/LakehouseConsumerDataCubeSourceBuilder.tsx",
     "./src/components/builder/source/LakehouseProducerDataCubeSourceBuilder.tsx",
-    "./src/components/builder/source/LakehouseProducerDataCubeSourceLoader.tsx",
     "./src/components/builder/source/LegendDataCubeSourceLoader.tsx",
     "./src/components/builder/source/LegendQueryDataCubeSourceBuilder.tsx",
     "./src/components/builder/source/LegendQueryDataCubeSourceBuilder_DataCubeApplicationPlugin.tsx",

package/lib/components/builder/source/LakehouseProducerDataCubeSourceLoader.d.ts

@@ -1,22 +0,0 @@
-/**
- * Copyright (c) 2020-present, Goldman Sachs
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import type { LakehouseProducerDataCubeSourceLoaderState } from '../../../stores/builder/source/LakehouseProducerDataCubeSourceLoaderState.js';
-export declare const LakehouseProducerDataCubeSourceLoader: ((props: {
-    partialSourceLoader: LakehouseProducerDataCubeSourceLoaderState;
-}) => import("react/jsx-runtime").JSX.Element) & {
-    displayName: string;
-};
-//# sourceMappingURL=LakehouseProducerDataCubeSourceLoader.d.ts.map

package/lib/components/builder/source/LakehouseProducerDataCubeSourceLoader.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"LakehouseProducerDataCubeSourceLoader.d.ts","sourceRoot":"","sources":["../../../../src/components/builder/source/LakehouseProducerDataCubeSourceLoader.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,OAAO,KAAK,EAAE,0CAA0C,EAAE,MAAM,8EAA8E,CAAC;AAK/I,eAAO,MAAM,qCAAqC,WACxC;IACN,mBAAmB,EAAE,0CAA0C,CAAC;CACjE;;CAgDF,CAAC"}

package/lib/components/builder/source/LakehouseProducerDataCubeSourceLoader.js

@@ -1,40 +0,0 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-/**
- * Copyright (c) 2020-present, Goldman Sachs
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { observer } from 'mobx-react-lite';
-import { useEffect } from 'react';
-import { useAuth } from 'react-oidc-context';
-import { useLegendDataCubeBuilderStore } from '../LegendDataCubeBuilderStoreProvider.js';
-import { FormButton, FormTextInput } from '@finos/legend-data-cube';
-export const LakehouseProducerDataCubeSourceLoader = observer((props) => {
-    const { partialSourceLoader } = props;
-    const auth = useAuth();
-    const store = useLegendDataCubeBuilderStore();
-    useEffect(() => {
-        partialSourceLoader.reset();
-    }, [partialSourceLoader]);
-    useEffect(() => {
-        partialSourceLoader.setUserManagerSettings(auth.settings);
-    }, [partialSourceLoader, auth]);
-    return (_jsx("div", { className: "flex h-full w-full", children: _jsx("div", { className: "m-3 flex w-full flex-col items-stretch gap-2 text-neutral-500", children: _jsxs("div", { className: "query-setup__wizard__group", children: [_jsx("div", { className: "query-setup__wizard__group__title", children: "Ingest Urn" }), _jsxs("div", { className: "flex h-full w-full flex-auto items-center justify-between text-nowrap", children: [_jsx(FormTextInput, { className: "w-3/4 text-base", value: partialSourceLoader.ingestDefinitionUrn, disabled: true }), _jsx(FormButton, { compact: true, className: "ml-1.5 text-nowrap text-sm text-black", onClick: () => {
-                                    partialSourceLoader
-                                        .loadIngestDefinition(auth.user?.access_token, store.ingestServerClient)
-                                        .catch((error) => store.alertService.alertUnhandledError(error));
-                                }, children: Boolean(partialSourceLoader.ingestDefinition)
-                                    ? 'Loaded!'
-                                    : 'Load Ingest' })] })] }) }) }));
-});
-//# sourceMappingURL=LakehouseProducerDataCubeSourceLoader.js.map

package/lib/components/builder/source/LakehouseProducerDataCubeSourceLoader.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"LakehouseProducerDataCubeSourceLoader.js","sourceRoot":"","sources":["../../../../src/components/builder/source/LakehouseProducerDataCubeSourceLoader.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAElC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,6BAA6B,EAAE,MAAM,0CAA0C,CAAC;AACzF,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAEpE,MAAM,CAAC,MAAM,qCAAqC,GAAG,QAAQ,CAC3D,CAAC,KAEA,EAAE,EAAE;IACH,MAAM,EAAE,mBAAmB,EAAE,GAAG,KAAK,CAAC;IACtC,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;IACvB,MAAM,KAAK,GAAG,6BAA6B,EAAE,CAAC;IAE9C,SAAS,CAAC,GAAG,EAAE;QACb,mBAAmB,CAAC,KAAK,EAAE,CAAC;IAC9B,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAC;IAE1B,SAAS,CAAC,GAAG,EAAE;QACb,mBAAmB,CAAC,sBAAsB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC5D,CAAC,EAAE,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC,CAAC;IAEhC,OAAO,CACL,cAAK,SAAS,EAAC,oBAAoB,YACjC,cAAK,SAAS,EAAC,+DAA+D,YAC5E,eAAK,SAAS,EAAC,4BAA4B,aACzC,cAAK,SAAS,EAAC,mCAAmC,2BAAiB,EACnE,eAAK,SAAS,EAAC,uEAAuE,aACpF,KAAC,aAAa,IACZ,SAAS,EAAC,iBAAiB,EAC3B,KAAK,EAAE,mBAAmB,CAAC,mBAAmB,EAC9C,QAAQ,EAAE,IAAI,GACd,EACF,KAAC,UAAU,IACT,OAAO,EAAE,IAAI,EACb,SAAS,EAAC,uCAAuC,EACjD,OAAO,EAAE,GAAG,EAAE;oCACZ,mBAAmB;yCAChB,oBAAoB,CACnB,IAAI,CAAC,IAAI,EAAE,YAAY,EACvB,KAAK,CAAC,kBAAkB,CACzB;yCACA,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CACf,KAAK,CAAC,YAAY,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAC9C,CAAC;gCACN,CAAC,YAEA,OAAO,CAAC,mBAAmB,CAAC,gBAAgB,CAAC;oCAC5C,CAAC,CAAC,SAAS;oCACX,CAAC,CAAC,aAAa,GACN,IACT,IACF,GACF,GACF,CACP,CAAC;AACJ,CAAC,CACF,CAAC"}

package/lib/stores/builder/source/LakehouseProducerDataCubeSourceLoaderState.d.ts

@@ -1,41 +0,0 @@
-/**
- * Copyright (c) 2025-present, Goldman Sachs
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { type PlainObject } from '@finos/legend-shared';
-import type { LegendDataCubeApplicationStore } from '../../LegendDataCubeBaseStore.js';
-import type { LegendDataCubeDataCubeEngine } from '../../LegendDataCubeDataCubeEngine.js';
-import { LegendDataCubeSourceLoaderState } from './LegendDataCubeSourceLoaderState.js';
-import type { DataCubeAlertService } from '@finos/legend-data-cube';
-import { type PersistentDataCube } from '@finos/legend-graph';
-import type { LakehouseIngestServerClient } from '@finos/legend-server-lakehouse';
-import { LegendDataCubeSourceBuilderType } from './LegendDataCubeSourceBuilderState.js';
-import type { UserManagerSettings } from 'oidc-client-ts';
-export declare class LakehouseProducerDataCubeSourceLoaderState extends LegendDataCubeSourceLoaderState {
-    ingestDefinition: PlainObject | undefined;
-    ingestDefinitionUrn: string;
-    ingestServerUrl: string;
-    private userManagerSettings;
-    private LAKEHOUSE_SECTION;
-    constructor(application: LegendDataCubeApplicationStore, engine: LegendDataCubeDataCubeEngine, alertService: DataCubeAlertService, sourceData: PlainObject, persistentDataCube: PersistentDataCube, onSuccess: () => Promise<void>, onError: (error: unknown) => Promise<void>);
-    setIngestDefinition(ingestDefinition: PlainObject | undefined): void;
-    setIngestDefinitionUrn(urn: string): void;
-    setUserManagerSettings(settings: UserManagerSettings | undefined): void;
-    get isValid(): boolean;
-    get label(): LegendDataCubeSourceBuilderType;
-    reset(): void;
-    loadIngestDefinition(access_token: string | undefined, lakehouseIngestServerClient: LakehouseIngestServerClient): Promise<void>;
-    load(source: PlainObject | undefined): Promise<PlainObject<T>>;
-}
-//# sourceMappingURL=LakehouseProducerDataCubeSourceLoaderState.d.ts.map

package/lib/stores/builder/source/LakehouseProducerDataCubeSourceLoaderState.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"LakehouseProducerDataCubeSourceLoaderState.d.ts","sourceRoot":"","sources":["../../../../src/stores/builder/source/LakehouseProducerDataCubeSourceLoaderState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAGL,KAAK,WAAW,EACjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,kCAAkC,CAAC;AACvF,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,uCAAuC,CAAC;AAC1F,OAAO,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAC;AACvF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAGL,KAAK,kBAAkB,EAExB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AAElF,OAAO,EAAE,+BAA+B,EAAE,MAAM,uCAAuC,CAAC;AACxF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAG1D,qBAAa,0CAA2C,SAAQ,+BAA+B;IAC7F,gBAAgB,EAAE,WAAW,GAAG,SAAS,CAAC;IAC1C,mBAAmB,EAAE,MAAM,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC;IAExB,OAAO,CAAC,mBAAmB,CAAkC;IAE7D,OAAO,CAAC,iBAAiB,CAAkB;gBAGzC,WAAW,EAAE,8BAA8B,EAC3C,MAAM,EAAE,4BAA4B,EACpC,YAAY,EAAE,oBAAoB,EAClC,UAAU,EAAE,WAAW,EACvB,kBAAkB,EAAE,kBAAkB,EACtC,SAAS,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EAC9B,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC;IAwB5C,mBAAmB,CAAC,gBAAgB,EAAE,WAAW,GAAG,SAAS;IAI7D,sBAAsB,CAAC,GAAG,EAAE,MAAM;IAIlC,sBAAsB,CAAC,QAAQ,EAAE,mBAAmB,GAAG,SAAS;IAIhE,IAAa,OAAO,IAAI,OAAO,CAE9B;IAED,IAAa,KAAK,oCAEjB;IAED,KAAK;IAQC,oBAAoB,CACxB,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,2BAA2B,EAAE,2BAA2B;IAwB3C,IAAI,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS;CAgCpD"}