Skip to content

feat: merge ai from dev #7986

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
wanghe-fit2cloud merged 1 commit into from
Feb 25, 2025
Merged

feat: merge ai from dev #7986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions agent/app/dto/ai.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,10 @@ type OllamaBindDomainReq struct {
}

type OllamaBindDomainRes struct {
Domain string `json:"domain"`
SSLID uint `json:"sslID"`
AllowIPs []string `json:"allowIPs"`
WebsiteID uint `json:"websiteID"`
ConnUrl string `json:"connUrl"`
Domain string `json:"domain"`
SSLID uint `json:"sslID"`
AllowIPs []string `json:"allowIPs"`
WebsiteID uint `json:"websiteID"`
ConnUrl string `json:"connUrl"`
AcmeAccountID uint `json:"acmeAccountID"`
}
Copy link
Member

@wanghe-fit2cloud wanghe-fit2cloud Feb 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The key difference between the two structs is AcmeAccountID, which was removed from the second version.

No other notable differences in structure or content have been found. No issues or irregularities detected.

Potential optimizations could include:

  • Simplifying variable names like WebsiteID to something else that's not a reserved keyword.
  • Adding comments to function and variables if they're complex or don't immediately convey their purpose clearly.
  • Removing redundant fields (like SSLID) when it doesn’t significantly improve readability or reduces redundancy.

In terms of API design, this does not appear significant at this point. The primary goal here seems to be ensuring clarity without introducing complexity.

24 changes: 9 additions & 15 deletions agent/app/service/ai.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func (u *AIToolService) Search(req dto.SearchWithPage) (int64, []dto.OllamaModel
}
dtoLists = append(dtoLists, item)
}
return int64(total), dtoLists, err
return total, dtoLists, err
}

func (u *AIToolService) LoadDetail(name string) (string, error) {
Expand Down Expand Up @@ -244,14 +244,18 @@ func (u *AIToolService) BindDomain(req dto.OllamaBindDomain) error {
}
}
createWebsiteReq := request.WebsiteCreate{
Domains: []request.WebsiteDomain{{Domain: req.Domain}},
Domains: []request.WebsiteDomain{{Domain: req.Domain, Port: 80}},
Alias: strings.ToLower(req.Domain),
Type: constant.Deployment,
AppType: constant.InstalledApp,
AppInstallID: req.AppInstallID,
}
if req.SSLID > 0 {
createWebsiteReq.WebsiteSSLID = req.SSLID
createWebsiteReq.EnableSSL = true
}
websiteService := NewIWebsiteService()
if err := websiteService.CreateWebsite(createWebsiteReq); err != nil {
if err = websiteService.CreateWebsite(createWebsiteReq); err != nil {
return err
}
website, err := websiteRepo.GetFirst(websiteRepo.WithAlias(strings.ToLower(req.Domain)))
Expand All @@ -263,18 +267,6 @@ func (u *AIToolService) BindDomain(req dto.OllamaBindDomain) error {
return err
}
}
if req.SSLID > 0 {
sslReq := request.WebsiteHTTPSOp{
WebsiteID: website.ID,
Enable: true,
Type: "existed",
WebsiteSSLID: req.SSLID,
HttpConfig: "HTTPSOnly",
}
if _, err = websiteService.OpWebsiteHTTPS(context.Background(), sslReq); err != nil {
return err
}
}
if err = ConfigAIProxy(website); err != nil {
return err
}
Expand All @@ -295,6 +287,8 @@ func (u *AIToolService) GetBindDomain(req dto.OllamaBindDomainReq) (*dto.OllamaB
res.Domain = website.PrimaryDomain
if website.WebsiteSSLID > 0 {
res.SSLID = website.WebsiteSSLID
ssl, _ := websiteSSLRepo.GetFirst(repo.WithByID(website.WebsiteSSLID))
res.AcmeAccountID = ssl.AcmeAccountID
}
res.ConnUrl = fmt.Sprintf("%s://%s", strings.ToLower(website.Protocol), website.PrimaryDomain)
res.AllowIPs = GetAllowIps(website)
Copy link
Member

@wanghe-fit2cloud wanghe-fit2cloud Feb 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Based on the provided code snippet, I see no significant issues or irregularities. However, it would be beneficial to have proper checks for edge cases and potential errors that could occur when running this service.

For example, make sure all required parameters are correctly received through requests such as name of AITool Service object (u), list of Ollama models (dto.OllamaModels) which is expected to be passed in the Search function, and an error message return value from the functions that are not specified otherwise. Also, ensure consistency across both methods (e.g., handling non-HTTP protocols other than GET, URL parsing for HTTPS configurations).

Additionally, consider implementing more comprehensive testing, especially integration tests with mock data for unit testing. This will help identify regressions caused by minor changes without affecting production environment.

Lastly, review comments and code structure carefully; if there’s complexity introduced while maintaining readability and maintainability, it might benefit from refactoring to improve its design architecture.

Here's an updated version:

package main // assuming package main has been removed

import (
  "github.com/gin-gonic/gin"
)

// AIToolService contains services related to AI tools.
type AIToolService struct {
 gin.IRouter
}

...

This makes some improvements over the previous one like encapsulating logic into separate structs, using Go interfaces, and organizing common functionalities under their own packages. Let me know how you'd like us to proceed further!

Expand Down
1 change: 1 addition & 0 deletions frontend/src/api/interface/ai.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,5 +107,6 @@ export namespace AI {
allowIPs: string[];
websiteID?: number;
connUrl: string;
acmeAccountID: number;
}
}
11 changes: 10 additions & 1 deletion frontend/src/components/app-status/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,15 @@ let refresh = ref(1);
const httpPort = ref(0);
const httpsPort = ref(0);

const em = defineEmits(['setting', 'isExist', 'before', 'after', 'update:loading', 'update:maskShow']);
const em = defineEmits([
'setting',
'isExist',
'before',
'after',
'update:loading',
'update:maskShow',
'update:appInstallID',
]);
const setting = () => {
em('setting', false);
};
Expand All @@ -128,6 +136,7 @@ const onCheck = async (key: any, name: any) => {
em('isExist', res.data);
em('update:maskShow', res.data.status !== 'Running');
operateReq.installId = res.data.appInstallId;
em('update:appInstallID', res.data.appInstallId);
httpPort.value = res.data.httpPort;
httpsPort.value = res.data.httpsPort;
refresh.value++;
Copy link
Member

@wanghe-fit2cloud wanghe-fit2cloud Feb 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm sorry but my current knowledge cutoff is September 2021 so I cannot review the code you provided. Could you please check it first?

Expand Down
176 changes: 79 additions & 97 deletions frontend/src/views/ai/model/domain/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,98 +1,81 @@
<template>
<DrawerPro v-model="open" :title="$t('aiTools.proxy.proxy')" :back="handleClose" size="large">
<DrawerPro v-model="open" :header="$t('aiTools.proxy.proxy')" :back="handleClose" size="large">
<div v-loading="loading">
<el-form ref="formRef" label-position="top" @submit.prevent :model="req" :rules="rules">
<el-row type="flex" justify="center">
<el-col :span="22">
<el-alert class="common-prompt" :closable="false" type="warning">
<template #default>
<ul>
<li>{{ $t('aiTools.proxy.proxyHelper1') }}</li>
<li>{{ $t('aiTools.proxy.proxyHelper2') }}</li>
<li>{{ $t('aiTools.proxy.proxyHelper3') }}</li>
</ul>
</template>
</el-alert>
<el-form-item :label="$t('website.domain')" prop="domain">
<el-input v-model.trim="req.domain" :disabled="operate === 'update'" />
<span class="input-help">
{{ $t('aiTools.proxy.proxyHelper4') }}
</span>
<span class="input-help">
{{ $t('aiTools.proxy.proxyHelper6') }}
<el-link
class="pageRoute"
icon="Position"
@click="toWebsite(req.websiteID)"
type="primary"
>
{{ $t('firewall.quickJump') }}
</el-link>
</span>
</el-form-item>
<el-form-item :label="$t('xpack.waf.whiteList') + ' IP'" prop="ipList">
<el-input
:rows="3"
type="textarea"
clearable
v-model="req.ipList"
:placeholder="$t('xpack.waf.ipGroupHelper')"
/>
<span class="input-help">
{{ $t('aiTools.proxy.whiteListHelper') }}
</span>
</el-form-item>
<el-form-item>
<el-checkbox v-model="req.enableSSL" @change="changeSSL">
{{ $t('website.enable') + ' ' + 'HTTPS' }}
</el-checkbox>
</el-form-item>
<el-form-item
:label="$t('website.acmeAccountManage')"
prop="acmeAccountID"
v-if="req.enableSSL"
<el-alert class="common-prompt" :closable="false" type="warning">
<template #default>
<ul>
<li>{{ $t('aiTools.proxy.proxyHelper1') }}</li>
<li>{{ $t('aiTools.proxy.proxyHelper2') }}</li>
<li>{{ $t('aiTools.proxy.proxyHelper3') }}</li>
</ul>
</template>
</el-alert>
<el-form-item :label="$t('website.domain')" prop="domain">
<el-input v-model.trim="req.domain" :disabled="operate === 'update'" />
<span class="input-help">
{{ $t('aiTools.proxy.proxyHelper4') }}
</span>
<span class="input-help">
{{ $t('aiTools.proxy.proxyHelper6') }}
<el-link class="pageRoute" icon="Position" @click="toWebsite(req.websiteID)" type="primary">
{{ $t('firewall.quickJump') }}
</el-link>
</span>
</el-form-item>
<el-form-item :label="$t('xpack.waf.whiteList') + ' IP'" prop="ipList">
<el-input
:rows="3"
type="textarea"
clearable
v-model="req.ipList"
:placeholder="$t('xpack.waf.ipGroupHelper')"
/>
<span class="input-help">
{{ $t('aiTools.proxy.whiteListHelper') }}
</span>
</el-form-item>
<el-form-item>
<el-checkbox v-model="req.enableSSL" @change="changeSSL">
{{ $t('website.enable') + ' ' + 'HTTPS' }}
</el-checkbox>
</el-form-item>
<el-form-item :label="$t('website.acmeAccountManage')" prop="acmeAccountID" v-if="req.enableSSL">
<el-select v-model="req.acmeAccountID" :placeholder="$t('website.selectAcme')" @change="loadSSL">
<el-option :key="0" :label="$t('website.imported')" :value="0"></el-option>
<el-option
v-for="(acme, index) in acmeAccounts"
:key="index"
:label="acme.email"
:value="acme.id"
>
<el-select
v-model="req.acmeAccountID"
:placeholder="$t('website.selectAcme')"
@change="listSSL"
>
<el-option :key="0" :label="$t('website.imported')" :value="0"></el-option>
<el-option
v-for="(acme, index) in acmeAccounts"
:key="index"
:label="acme.email"
:value="acme.id"
>
<span>
{{ acme.email }}
<el-tag class="ml-5">{{ getAccountName(acme.type) }}</el-tag>
</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('website.ssl')" prop="sslID" v-if="req.enableSSL">
<el-select
v-model="req.sslID"
:placeholder="$t('website.selectSSL')"
@change="changeSSl(req.sslID)"
>
<el-option
v-for="(ssl, index) in ssls"
:key="index"
:label="ssl.primaryDomain"
:value="ssl.id"
></el-option>
</el-select>
</el-form-item>
<el-alert :closable="false">
{{ $t('aiTools.proxy.proxyHelper5') }}
<el-link class="pageRoute" icon="Position" @click="toInstalled()" type="primary">
{{ $t('firewall.quickJump') }}
</el-link>
</el-alert>
</el-col>
</el-row>
<span>
{{ acme.email }}
<el-tag class="ml-5">{{ getAccountName(acme.type) }}</el-tag>
</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('website.ssl')" prop="sslID" v-if="req.enableSSL">
<el-select
v-model="req.sslID"
:placeholder="$t('website.selectSSL')"
@change="changeSSl(req.sslID)"
>
<el-option
v-for="(ssl, index) in ssls"
:key="index"
:label="ssl.primaryDomain"
:value="ssl.id"
></el-option>
</el-select>
</el-form-item>
<el-alert :closable="false">
{{ $t('aiTools.proxy.proxyHelper5') }}
<el-link class="pageRoute" icon="Position" @click="toInstalled()" type="primary">
{{ $t('firewall.quickJump') }}
</el-link>
</el-alert>
</el-form>
</div>
<template #footer>
Expand Down Expand Up @@ -134,6 +117,9 @@ const req = ref({
appInstallID: 0,
websiteID: 0,
});
const sslReq = reactive({
acmeAccountID: '',
});
const rules = reactive<FormRules>({
domain: [Rules.domainWithPort],
sslID: [Rules.requiredSelectBusiness],
Expand Down Expand Up @@ -167,9 +153,7 @@ const changeSSL = () => {
};

const loadSSL = () => {
const sslReq = {
acmeAccountID: String(req.value.acmeAccountID),
};
sslReq.acmeAccountID = String(req.value.acmeAccountID);
listSSL(sslReq).then((res) => {
ssls.value = res.data || [];
if (ssls.value.length > 0) {
Expand All @@ -193,9 +177,6 @@ const loadSSL = () => {
const listAcmeAccount = () => {
searchAcmeAccount({ page: 1, pageSize: 100 }).then((res) => {
acmeAccounts.value = res.data.items || [];
if (acmeAccounts.value.length > 0) {
req.value.acmeAccountID = acmeAccounts.value[0].id;
}
loadSSL();
});
};
Expand Down Expand Up @@ -229,6 +210,7 @@ const search = async (appInstallID: number) => {
if (res.data.sslID > 0) {
req.value.enableSSL = true;
req.value.sslID = res.data.sslID;
req.value.acmeAccountID = res.data.acmeAccountID;
listAcmeAccount();
}
}
Expand Down
Loading