Skip to content

适配数据结构循环引用 #99

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

Open
kuixing233 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

适配数据结构循环引用 #99

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47e53e5
循环引用判断
Sep 2, 2025
1ffcee0
Merge branch 'self-reference' of https://github.com/kuixing233/tencen…
Sep 2, 2025
00ff704
Merge branch 'TencentCloud:master' into self-reference
kuixing233 Sep 4, 2025
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
41 changes: 31 additions & 10 deletions tccli/loaders.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,22 +327,36 @@ def _filling_param_info(self, param_info, para, param_type, member):
param_info[para["name"]]["members"] = member
return param_info

def _get_param_info(self, param_model, object_model):
def _get_param_info(self, param_model, object_model, visited=None):
if visited is None:
visited = set()

param_info = {}
for para in param_model:
if para["type"] == "list":
if para["member"] not in BASE_TYPE:
if para["member"] in visited:
self._filling_param_info(param_info, para, "list", [para["member"]])
continue
visited.add(para["member"])
self._filling_param_info(
param_info, para, "list",
[self._get_param_info(object_model[para["member"]]["members"], object_model)])
[self._get_param_info(object_model[para["member"]]["members"], object_model, visited)]
)
visited.remove(para["member"])
else:
self._filling_param_info(
param_info, para, "list", [para["member"]])
self._filling_param_info(param_info, para, "list", [para["member"]])
else:
if para["member"] not in BASE_TYPE:
if para["member"] in visited:
self._filling_param_info(param_info, para, para["member"], para["member"])
continue
visited.add(para["member"])
param_info = self._filling_param_info(
param_info, para, para["member"],
self._get_param_info(object_model[para["member"]]["members"], object_model))
self._get_param_info(object_model[para["member"]]["members"], object_model, visited)
)
visited.remove(para["member"])
else:
self._filling_param_info(param_info, para, para["member"], para["member"])
return param_info
Expand Down Expand Up @@ -383,9 +397,10 @@ def get_unfold_param_info(self, service, version, action, profile="default", par
service_model = self.get_service_model(service, version)
object_model = service_model["objects"]
all_param_list = []
visited = set()
for para in object_model[action + "Request"]["members"]:
param_list = []
self._get_unfold_param_info(object_model, all_param_list, param_list, para)
self._get_unfold_param_info(object_model, all_param_list, param_list, para, visited)

if param_array:
all_param_list = self._add_array_item(all_param_list, profile)
Expand All @@ -409,19 +424,25 @@ def _add_array_item(self, param_list, profile):
all_param_list.append(tmp)
return all_param_list

def _recur_get_unfold_param_info(self, param_model, object_model, return_param_list, param_list):
def _recur_get_unfold_param_info(self, param_model, object_model, return_param_list, param_list, visited):
for para in param_model:
self._get_unfold_param_info(object_model, return_param_list, param_list, para)
self._get_unfold_param_info(object_model, return_param_list, param_list, para, visited)
if param_list.pop().isdigit():
param_list.pop()

def _get_unfold_param_info(self, object_model, return_param_list, param_list, para):
def _get_unfold_param_info(self, object_model, return_param_list, param_list, para, visited):
param_list.append(para["name"])
if para["type"] == "list" and para["member"] not in BASE_TYPE:
param_list.append('0')
if para["member"] not in BASE_TYPE:
if para["member"] in visited:
if param_list:
param_list.pop()
return
visited.add(para["member"])
self._recur_get_unfold_param_info(object_model[para["member"]]["members"],
object_model, return_param_list, param_list)
object_model, return_param_list, param_list, visited)
visited.remove(para["member"])
else:
tmp = copy.deepcopy(param_list)
return_param_list.append(tmp)
Expand Down