cpee-llm 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c74dfc59f0ee935ca13bbab9135b7bbbe573e378388b1b42bf7d7319822e3452
-  data.tar.gz: 3bebf8d541a090b0732954f70e7ee08a844c83fa6facbf58d686242b8e77e8e6
+  metadata.gz: 4e0d18f88f4bc0727522bc34d61c10df0e565d1eb07c741d5205cdf2028b1b8b
+  data.tar.gz: 00e8d8cd775a32eed1a95b0b10497c506af54cfc20c9eafd37a1f0b971af5c78
 SHA512:
-  metadata.gz: d6adbaf916b93cd4407ff97cf5fd7d2d72187e73c68c1fa57aece7235bc08cc88adb66227d9085fb91dfa19578af61a44736e06f9dfb43530b8dabce2c1839d8
-  data.tar.gz: ed95025c3b393da1b88596a5eb0e30b05706a8aaeda9e0b0736092e8d0e7c4379d1b09f2503a7eb55c8a962e690a9c49c863ff1c3a5a891462e2027da8055193
+  metadata.gz: 7f687a3d87195bc7780ec21c21ad5b24dbbaf8b406c5268b41fe991a3bf47c4bcbf9298bb3cdf227d9e0be80aad852add68d868023ba03ff52f0db07d39207d1
+  data.tar.gz: 00d10455ce802848328d76d9f6312260d6ffba07639348218dc91ef9d1720af07673f32d55599201eb3d3701fc4bed75c9a63d813bff39ca568720c6d3d5f7cf

data/cpee-llm.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-llm"
-  s.version          = "1.0.1"
+  s.version          = "1.0.2"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0-or-later"
   s.summary          = "CPEE Conversational Agents"
@@ -26,4 +26,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'typhoeus', '~> 1.4'
   s.add_runtime_dependency 'ruby_llm', '~> 1.15'
   s.add_runtime_dependency 'rag_embeddings', '~> 0'
+  s.add_runtime_dependency 'cpee-transformation', '~> 1.0'
 end

data/lib/cpee/llm/dataflow.rb

@@ -165,8 +165,6 @@ module CPEE
           end
         end
 
-        pp json_e
-        pp cpee_model
         # ==============================conditions (only alternative)=======================
         json_e['gateway_conditions'].each do |i, value|
           if i.end_with?("s")

data/lib/cpee/llm/functions.rb

@@ -16,6 +16,9 @@
 
 require_relative 'rubyllm_requests'
 require 'json'
+require 'cpee/transformation/transformer'
+require 'cpee/transformation/cpee'
+require 'cpee/transformation/mermaid'
 
 module CPEE
 
@@ -25,34 +28,22 @@ module CPEE
 
       include RubyLLM_Requests
 
-        def cpee_to_mermaid(cpee) #{{{
-          srv = Riddl::Client.new('http://localhost:9295/mermaid/cpee')
-          status, res = srv.post [
-            Riddl::Parameter::Complex.new("description","text/xml",cpee),
-            Riddl::Parameter::Simple.new("type","description")
-          ]
-          if status >= 200 && status < 300
-            res
-          else
-            raise 'error when converting cpee to mermaid'
-          end
-          return res[0].value().read()
-        end #}}}
-
-        def mermaid_to_cpee(mermaid) #{{{
-          srv = Riddl::Client.new('http://localhost:9295/cpee/mermaid')
-          status, res = srv.post [
-            Riddl::Parameter::Complex.new("description","text/plain",mermaid),
-            Riddl::Parameter::Simple.new("type","description")
-          ]
-          if status >= 200 && status < 300
-            res
-          else
-            raise 'error when converting mermaid to cpee'
-          end
-          return res[0].value().read()
-        end #}}}
+      def cpee_to_mermaid(cpee) #{{{
+        model = CPEE::Transformation::Source::CPEE.new(cpee)
+        trans = CPEE::Transformation::Transformer.new(model)
+        traces = trans.build_traces
+        tree = trans.build_tree(false)
+        trans.generate_model(CPEE::Transformation::Target::Mermaid)
+      end #}}}
+      def mermaid_to_cpee(mermaid) #{{{
+        model = CPEE::Transformation::Source::Mermaid.new(mermaid)
+
+        trans = CPEE::Transformation::Transformer.new(model)
+        traces = trans.build_traces
 
+        tree = trans.build_tree(false)
+        trans.generate_model(CPEE::Transformation::Target::CPEE)
+      end #}}}
 
       def generate_model(myllm,user_input,temperature,llms) #{{{
         begin
@@ -178,10 +169,8 @@ module CPEE
             llm_response = inside.empty? ? llm_response : inside[0][1]
             #check if response is json:
             begin
-              pp "here"
               hash = JSON.parse(llm_response)
             rescue JSON::ParserError => e
-              pp "there"
               raise LLMError.new("Something went wrong and llm was not able to generate Json data flow: #{llm_response}", 500)
             end
             return llm_response

data/lib/cpee/llm/implementation.rb

@@ -41,7 +41,6 @@ module CPEE
         temperature = @p.shift.value.read if @p[0]&.name == 'temperature'
 
         doc = XML::Smart.string(input_cpee)
-        pp temperature
         begin
           output_cpee = if prompt_type == 'generate_noendpoints'
             llm_response = generate_model(myllm,user_input,temperature,llms)
@@ -64,7 +63,6 @@ module CPEE
 
         return(Riddl::Parameter::Complex.new("llm_out","application/json",{:user_input => user_input, :used_llm => myllm, :input_cpee => input_cpee, :input_intermediate => doc.root().empty?() ? "" : cpee_to_mermaid(doc.to_s()), :output_intermediate => llm_response, :output_cpee => output_cpee, :status => "Success"}.to_json()))
       rescue LLMError => e
-        pp 'here in error'
         @status = e&.http_response || 400
         return Riddl::Parameter::Complex.new("llm_out","application/json",{ :error => "#{prompt_type} #{e.message}"}.to_json())
       end
@@ -166,7 +164,6 @@ module CPEE
         begin
           dataflow = generate_dataflow(myllm,mermaid_model,api_speck,llms)
         rescue LLMError => e
-          pp e.http_response
           @status = e.http_response || 400
           return Riddl::Parameter::Complex.new("llm_out","application/json",{:error => e.message}.to_json())
         end

data/lib/cpee/llm/rubyllm_requests.rb

@@ -92,8 +92,6 @@ module CPEE
       def generate_mermaid_model(llm, user_input, temperature, llms={}) #{{{
         max_tokens = 4000
         temperature = temperature.nil? ? 0.1 : temperature.to_f
-        pp "here"
-        pp temperature
         system_prompt = File.read(File.join(__dir__,"prompts/generate1.txt"))
         user_prompt = "Consider following process description: #{user_input}. Generate a BPMN model in Mermaid.js format."
         new_mermaid = generate_content(llm,system_prompt,user_prompt,max_tokens,temperature,llms)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee-llm
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Nataliia Klievtsova
@@ -95,6 +95,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cpee-transformation
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: see http://cpee.org
 email: n.klievtsova@gmail.com
 executables: