Skip to content

fix more circular dependencies in rest server #145

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

Merged
hippogr merged 2 commits into from
Feb 6, 2026
Merged

fix more circular dependencies in rest server #145

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
4d1ef66
fix more circular dependencies in rest server
Feb 5, 2026
1e0e30c
Merge branch 'release/1.5' into ruigao/fix-more-depencies
zhogu Feb 5, 2026
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
7 changes: 6 additions & 1 deletion src/rest-server/src/models/v2/storage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
// module dependencies
const status = require('statuses');
const createError = require('@pai/utils/error');
const user = require('@pai/models/v2/user');
const secret = require('@pai/models/kubernetes/k8s-secret');
const kubernetes = require('@pai/models/kubernetes/kubernetes');
const logger = require('@pai/config/logger');
Expand Down Expand Up @@ -178,6 +177,9 @@ const convertVolumeDetail = async (pvc) => {
};

const list = async (userName, filterDefault = false) => {
// Lazy require to avoid circular dependency
const user = require('@pai/models/v2/user');

let response;
if (pvcCache.has('storageList')) {
logger.info('Read persistant volume claim list from cache');
Expand Down Expand Up @@ -247,6 +249,9 @@ const list = async (userName, filterDefault = false) => {
};

const get = async (storageName, userName) => {
// Lazy require to avoid circular dependency
const user = require('@pai/models/v2/user');

let response;
if (pvcCache.has(storageName)) {
logger.info(`Read persistant volume claim from cache: ${storageName}`);
Expand Down
4 changes: 3 additions & 1 deletion src/rest-server/src/utils/manager/user/crudK8sSecret.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ const logger = require('@pai/config/logger');
const groupModel = require('@pai/models/v2/group');
const k8sModel = require('@pai/models/kubernetes/kubernetes');
const { Mutex } = require('async-mutex');
const { job } = require('@pai/models/v2/job');

const USER_NAMESPACE = process.env.PAI_USER_NAMESPACE || 'pai-user-v2';

Expand All @@ -44,6 +43,9 @@ const cache = new Map();
const readMutex = new Mutex();

async function getHistoryVCs(name, grouplist, retrieveFromHistory=true) {
// Lazy require to avoid circular dependency
const { job } = require('@pai/models/v2/job');

// Retrieve VC list from the user's job history
let vcsFromJob = [];
if (retrieveFromHistory) {
Expand Down