This is an automated email from the ASF dual-hosted git repository. linxinyuan pushed a commit to branch revert-2898-dependabot/pip/core/amber/scikit-learn-1.5.0 in repository https://gitbox.apache.org/repos/asf/texera.git
commit ed8029ab36d2bbbe469dc2e6fe4aebc78fc91c94 Author: Xinyuan Lin <[email protected]> AuthorDate: Tue Sep 30 16:56:39 2025 -0700 Revert "fix: Bump scikit-learn from 1.3.2 to 1.5.0 in /core/amber (#2898)" This reverts commit ec4c035180857fb146c169a60980be5980082792. --- core/amber/operator-requirements.txt | 2 +- .../ics/amber/engine/e2e/DataProcessingSpec.scala | 3 --- .../edu/uci/ics/amber/engine/e2e/PauseSpec.scala | 3 --- .../user/user-quota/user-quota.component.html | 23 +++++++++++++--------- .../user/user-quota/user-quota.component.scss | 4 ++-- .../computing-unit-selection.component.ts | 2 +- .../computing-unit-status.service.ts | 7 +------ deployment/computing-unit-master.dockerfile | 11 ++--------- 8 files changed, 21 insertions(+), 34 deletions(-) diff --git a/core/amber/operator-requirements.txt b/core/amber/operator-requirements.txt index 231ce34703..c13923241e 100644 --- a/core/amber/operator-requirements.txt +++ b/core/amber/operator-requirements.txt @@ -21,4 +21,4 @@ praw==7.6.1 pillow==10.2.0 pybase64==1.3.2 torch==2.4.1 -scikit-learn==1.5.0 +scikit-learn==1.4.0 diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/DataProcessingSpec.scala b/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/DataProcessingSpec.scala index 2cf6e53feb..3d6616af8e 100644 --- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/DataProcessingSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/DataProcessingSpec.scala @@ -59,9 +59,6 @@ class DataProcessingSpec override def beforeAll(): Unit = { system.actorOf(Props[SingleNodeListener](), "cluster-info") - // These test cases access postgres in CI, but occasionally the jdbc driver cannot be found during CI run. - // Explicitly load the JDBC driver to avoid flaky CI failures. - Class.forName("org.postgresql.Driver") } override def afterAll(): Unit = { diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/PauseSpec.scala b/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/PauseSpec.scala index bd4164798d..1cae358e3f 100644 --- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/PauseSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/PauseSpec.scala @@ -50,9 +50,6 @@ class PauseSpec override def beforeAll(): Unit = { system.actorOf(Props[SingleNodeListener](), "cluster-info") - // These test cases access postgres in CI, but occasionally the jdbc driver cannot be found during CI run. - // Explicitly load the JDBC driver to avoid flaky CI failures. - Class.forName("org.postgresql.Driver") } override def afterAll(): Unit = { diff --git a/core/gui/src/app/dashboard/component/user/user-quota/user-quota.component.html b/core/gui/src/app/dashboard/component/user/user-quota/user-quota.component.html index 51a1dcbf69..5df5793baf 100644 --- a/core/gui/src/app/dashboard/component/user/user-quota/user-quota.component.html +++ b/core/gui/src/app/dashboard/component/user/user-quota/user-quota.component.html @@ -66,6 +66,20 @@ <p class="info-content">{{ formatSize(this.totalQuotaSize) }}</p> </div> </div> + <nz-card + class="section-title" + [style.backgroundColor]="backgroundColor"> + <h2 + class="page-title" + [style.color]="textColor"> + Diagram + </h2> + </nz-card> + <div class="charts-grid"> + <div id="sizePieChart"></div> + <div id="datasetLineChart"></div> + <div id="workflowLineChart"></div> + </div> </nz-tab> <nz-tab nzTitle="Result Cache"> <nz-collapse> @@ -110,15 +124,6 @@ </nz-collapse-panel> </nz-collapse> </nz-tab> - <nz-tab - nzTitle="Diagrams" - nzForceRender="true"> - <div class="charts-grid"> - <div id="sizePieChart"></div> - <div id="datasetLineChart"></div> - <div id="workflowLineChart"></div> - </div> - </nz-tab> </nz-tabset> </div> </div> diff --git a/core/gui/src/app/dashboard/component/user/user-quota/user-quota.component.scss b/core/gui/src/app/dashboard/component/user/user-quota/user-quota.component.scss index 6efa34ba61..d5b32caba8 100644 --- a/core/gui/src/app/dashboard/component/user/user-quota/user-quota.component.scss +++ b/core/gui/src/app/dashboard/component/user/user-quota/user-quota.component.scss @@ -49,8 +49,7 @@ display: flex; flex-wrap: wrap; justify-content: center; - height: 70vh; - overflow-y: auto; + padding-top: 40px; > div { display: flex; @@ -60,6 +59,7 @@ background: #fff; box-shadow: 0 0 10px rgba(0, 0, 0, 0.1); padding: 10px; + height: 100%; &:hover { box-shadow: 0 0 15px rgba(0, 0, 0, 0.2); diff --git a/core/gui/src/app/workspace/component/power-button/computing-unit-selection.component.ts b/core/gui/src/app/workspace/component/power-button/computing-unit-selection.component.ts index cc42b86325..cde1da2742 100644 --- a/core/gui/src/app/workspace/component/power-button/computing-unit-selection.component.ts +++ b/core/gui/src/app/workspace/component/power-button/computing-unit-selection.component.ts @@ -188,7 +188,7 @@ export class ComputingUnitSelectionComponent implements OnInit { /** * Registers a subscription to listen for workflow metadata changes; - * Calls `selectComputingUnit` when the `wid` changes; + * Calls `onComputingUnitChange` when the `wid` changes; * The wid can change by time because of the workspace rendering; */ private registerWorkflowMetadataSubscription(): void { diff --git a/core/gui/src/app/workspace/service/computing-unit-status/computing-unit-status.service.ts b/core/gui/src/app/workspace/service/computing-unit-status/computing-unit-status.service.ts index 4604e52c6f..b5c840c866 100644 --- a/core/gui/src/app/workspace/service/computing-unit-status/computing-unit-status.service.ts +++ b/core/gui/src/app/workspace/service/computing-unit-status/computing-unit-status.service.ts @@ -51,7 +51,6 @@ export class ComputingUnitStatusService implements OnDestroy { private readonly REFRESH_INTERVAL_MS = 2000; private refreshSubscription: Subscription | null = null; private currentConnectedCuid?: number; - private currentConnectedWid?: number; private selectedUnitPoll?: Subscription; constructor( @@ -149,23 +148,19 @@ export class ComputingUnitStatusService implements OnDestroy { }); } - // /** * Select a computing unit **by its CUID** and emit the updated selection. */ public selectComputingUnit(wid: number | undefined, cuid: number): void { const trySelect = (unit: DashboardWorkflowComputingUnit) => { // open websocket if needed - const shouldReconnect = this.currentConnectedCuid !== cuid || this.currentConnectedWid !== wid; - if (isDefined(wid) && shouldReconnect) { + if (isDefined(wid) && this.currentConnectedCuid !== cuid) { if (this.workflowWebsocketService.isConnected) { this.workflowWebsocketService.closeWebsocket(); this.workflowStatusService.clearStatus(); } - this.workflowWebsocketService.openWebsocket(wid, this.userService.getCurrentUser()?.uid, cuid); this.currentConnectedCuid = cuid; - this.currentConnectedWid = wid; this.selectedUnitSubject.next(unit); this.startPollingSelectedUnit(cuid); } diff --git a/deployment/computing-unit-master.dockerfile b/deployment/computing-unit-master.dockerfile index 0f10729527..167bf1bccc 100644 --- a/deployment/computing-unit-master.dockerfile +++ b/deployment/computing-unit-master.dockerfile @@ -84,16 +84,9 @@ RUN curl -O https://cran.r-project.org/src/base/R-4/R-${R_VERSION}.tar.gz && \ pip3 install -r /tmp/requirements.txt && \ pip3 install -r /tmp/operator-requirements.txt && \ pip3 install -r /tmp/r-requirements.txt -# Install R packages, pinning arrow to 14.0.2.1 explicitly RUN Rscript -e "options(repos = c(CRAN = 'https://cran.r-project.org')); \ - install.packages(c('coro', 'dplyr'), \ - Ncpus = parallel::detectCores())" && \ - Rscript -e "options(repos = c(CRAN = 'https://cran.r-project.org')); \ - if (!requireNamespace('remotes', quietly=TRUE)) \ - install.packages('remotes'); \ - remotes::install_version('arrow', version='14.0.2.1', \ - repos='https://cran.r-project.org', upgrade='never'); \ - cat('R arrow version: ', as.character(packageVersion('arrow')), '\n')" + install.packages(c('coro', 'arrow', 'dplyr'), \ + Ncpus = parallel::detectCores())" ENV LD_LIBRARY_PATH=/usr/local/lib/R/lib:$LD_LIBRARY_PATH # Copy the built texera binary from the build phase
