Merge branch 'master' of http://47.103.154.90:83/r/WI/Service.V1.0

TangCheng

2025-04-14 4ad5a2ca4d531ff582729dba556f6eb0d2a0e6fd

Merge branch 'master' of http://47.103.154.90:83/r/WI/Service.V1.0

 JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/javaai/jsonflow/core/SMTJsonFlowManager.java

@@ -39,8 +39,8 @@
    {

        // 创建脚本连接池

        GenericObjectPoolConfig<SMTJsonFlowScriptJet> config = new GenericObjectPoolConfig<>();

        config.setMaxTotal(32);

        config.setMinIdle(32);

        config.setMaxTotal(102400);

        config.setMinIdle(0);

        _scriptJetPool = new GenericObjectPool<>(new SMTJsonFlowScriptPoolFactory(), config);



        


 JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/javaai/llm/qwen/SMTLLMFactoryQwen.java

@@ -1,11 +1,5 @@
package com.smtaiserver.smtaiserver.javaai.llm.qwen;



import org.apache.commons.pool2.BasePooledObjectFactory;

import org.apache.commons.pool2.PooledObject;

import org.apache.commons.pool2.impl.DefaultPooledObject;

import org.apache.commons.pool2.impl.GenericObjectPool;

import org.apache.commons.pool2.impl.GenericObjectPoolConfig;



import com.alibaba.dashscope.aigc.generation.Generation;

import com.alibaba.dashscope.embeddings.TextEmbedding;

import com.alibaba.dashscope.utils.Constants;

@@ -16,35 +10,6 @@


public class SMTLLMFactoryQwen extends SMTLLMFactory 

{

    public class SMTQwenLLMPoolFactory extends BasePooledObjectFactory<Generation> 
    {

        @Override

        public Generation create() throws Exception {

            return new Generation();

        }



        @Override

        public PooledObject<Generation> wrap(Generation obj) {

            return new DefaultPooledObject<>(obj);

        } 
    }

	
    public class SMTQwenEmbedPoolFactory extends BasePooledObjectFactory<TextEmbedding> 
    {

        @Override

        public TextEmbedding create() throws Exception {

            return new TextEmbedding();

        }



        @Override

        public PooledObject<TextEmbedding> wrap(TextEmbedding obj) {

            return new DefaultPooledObject<>(obj);

        } 
    }

	
    ////////////////////////////////////////////////////////////////////////////////////////

    private GenericObjectPool<TextEmbedding>     _qwenEmbedPool;

    private GenericObjectPool<Generation>         _qwennLLMPool;

    private Json                                _jsonFactory;

    private Json                                _jsonConnect;

    

@@ -57,18 +22,7 @@
        _jsonConnect = Json.read(rec.getString("connect_args"));

        

        Constants.apiKey= _jsonFactory.getJson("key").asString(); //"sk-57653d19816c44ed81c731ebadeaa3d9";

        {

            GenericObjectPoolConfig<Generation> config = new GenericObjectPoolConfig<>();

            config.setMaxTotal(32);

            config.setMinIdle(32);

            _qwennLLMPool = new GenericObjectPool<>(new SMTQwenLLMPoolFactory(), config);

        }

        {

            GenericObjectPoolConfig<TextEmbedding> config = new GenericObjectPoolConfig<>();

            config.setMaxTotal(32);

            config.setMinIdle(32);

            _qwenEmbedPool = new GenericObjectPool<>(new SMTQwenEmbedPoolFactory(), config);

       }



    }

    

    public Json getConnectJson()

@@ -78,22 +32,23 @@
    

    public SMTLLMConnect allocLLM() throws Exception

    {

        Generation gen = _qwennLLMPool.borrowObject();

        Generation gen = new Generation(); //_qwennLLMPool.borrowObject();

        return new SMTLLMConnectQwen(gen, this);

    }

    

    public TextEmbedding allocLLMEmbedding() throws Exception

    {

        return _qwenEmbedPool.borrowObject();

        //return _qwenEmbedPool.borrowObject();

        return new TextEmbedding();

    }

    

    public void freeLLMEmbedding(TextEmbedding embed)

    {

        _qwenEmbedPool.returnObject(embed);

        //_qwenEmbedPool.returnObject(embed);

    }

    

    public void returnGenToPool(Generation gen)

    {

        _qwennLLMPool.returnObject(gen);

        //_qwennLLMPool.returnObject(gen);

    }

}