Retain promises, move from "Object" to "HashRef" as type

Corion · Apr 14, 2024 · ea08bfb · ea08bfb
1 parent 3aaf548
commit ea08bfb
Show file tree

Hide file tree

Showing 21 changed files with 37 additions and 37 deletions.
diff --git a/lib/AI/Ollama/Client/Impl.pm b/lib/AI/Ollama/Client/Impl.pm
@@ -49,7 +49,7 @@ use AI::Ollama::RequestOptions;
 
 =cut
 
-# this should be more configurable, and potentially you don't want validation?!
+# XXX this should be more configurable, and potentially you don't want validation?!
 has 'schema' => (
     is => 'lazy',
     default => sub {
@@ -70,7 +70,7 @@ has 'ua' => (
 
 has 'server' => (
     is => 'lazy',
-    default => sub { 'http://localhost:11434/api' },
+    default => sub { 'http://localhost:11434/api' }, # XXX pull from OpenAPI file instead
 );
 
 =head1 METHODS
@@ -143,7 +143,7 @@ sub checkBlob( $self, %options ) {
             # An unknown/unhandled response, likely an error
             $res->fail($resp);
         }
-    });
+    })->retain;
 
     # Start our transaction
     $tx = $self->ua->start_p($tx)->then(sub($tx) {
@@ -225,7 +225,7 @@ sub createBlob( $self, %options ) {
             # An unknown/unhandled response, likely an error
             $res->fail($resp);
         }
-    });
+    })->retain;
 
     # Start our transaction
     $tx = $self->ua->start_p($tx)->then(sub($tx) {
@@ -472,7 +472,7 @@ sub copyModel( $self, %options ) {
             # An unknown/unhandled response, likely an error
             $res->fail($resp);
         }
-    });
+    })->retain;
 
     # Start our transaction
     $tx = $self->ua->start_p($tx)->then(sub($tx) {
@@ -677,7 +677,7 @@ sub deleteModel( $self, %options ) {
             # An unknown/unhandled response, likely an error
             $res->fail($resp);
         }
-    });
+    })->retain;
 
     # Start our transaction
     $tx = $self->ua->start_p($tx)->then(sub($tx) {
@@ -776,7 +776,7 @@ sub generateEmbedding( $self, %options ) {
             # An unknown/unhandled response, likely an error
             $res->fail($resp);
         }
-    });
+    })->retain;
 
     # Start our transaction
     $tx = $self->ua->start_p($tx)->then(sub($tx) {
@@ -1066,7 +1066,7 @@ sub pullModel( $self, %options ) {
             # An unknown/unhandled response, likely an error
             $res->fail($resp);
         }
-    });
+    })->retain;
 
     # Start our transaction
     $tx = $self->ua->start_p($tx)->then(sub($tx) {
@@ -1165,7 +1165,7 @@ sub pushModel( $self, %options ) {
             # An unknown/unhandled response, likely an error
             $res->fail($resp);
         }
-    });
+    })->retain;
 
     # Start our transaction
     $tx = $self->ua->start_p($tx)->then(sub($tx) {
@@ -1256,7 +1256,7 @@ sub showModelInfo( $self, %options ) {
             # An unknown/unhandled response, likely an error
             $res->fail($resp);
         }
-    });
+    })->retain;
 
     # Start our transaction
     $tx = $self->ua->start_p($tx)->then(sub($tx) {
@@ -1332,7 +1332,7 @@ sub listModels( $self, %options ) {
             # An unknown/unhandled response, likely an error
             $res->fail($resp);
         }
-    });
+    })->retain;
 
     # Start our transaction
     $tx = $self->ua->start_p($tx)->then(sub($tx) {

diff --git a/lib/AI/Ollama/CopyModelRequest.pm b/lib/AI/Ollama/CopyModelRequest.pm
@@ -4,7 +4,7 @@ use 5.020;
 use Moo 2;
 use experimental 'signatures';
 use stable 'postderef';
-use Types::Standard qw(Str Bool Num Int Object ArrayRef);
+use Types::Standard qw(Str Bool Num Int ArrayRef HashRef);
 use MooX::TypeTiny;
 
 =head1 NAME

diff --git a/lib/AI/Ollama/CreateModelRequest.pm b/lib/AI/Ollama/CreateModelRequest.pm
@@ -4,7 +4,7 @@ use 5.020;
 use Moo 2;
 use experimental 'signatures';
 use stable 'postderef';
-use Types::Standard qw(Str Bool Num Int Object ArrayRef);
+use Types::Standard qw(Str Bool Num Int ArrayRef HashRef);
 use MooX::TypeTiny;
 
 =head1 NAME

diff --git a/lib/AI/Ollama/CreateModelResponse.pm b/lib/AI/Ollama/CreateModelResponse.pm
@@ -4,7 +4,7 @@ use 5.020;
 use Moo 2;
 use experimental 'signatures';
 use stable 'postderef';
-use Types::Standard qw(Str Bool Num Int Object ArrayRef);
+use Types::Standard qw(Str Bool Num Int ArrayRef HashRef);
 use MooX::TypeTiny;
 
 =head1 NAME

diff --git a/lib/AI/Ollama/DeleteModelRequest.pm b/lib/AI/Ollama/DeleteModelRequest.pm
@@ -4,7 +4,7 @@ use 5.020;
 use Moo 2;
 use experimental 'signatures';
 use stable 'postderef';
-use Types::Standard qw(Str Bool Num Int Object ArrayRef);
+use Types::Standard qw(Str Bool Num Int ArrayRef HashRef);
 use MooX::TypeTiny;
 
 =head1 NAME

diff --git a/lib/AI/Ollama/GenerateChatCompletionRequest.pm b/lib/AI/Ollama/GenerateChatCompletionRequest.pm
@@ -4,7 +4,7 @@ use 5.020;
 use Moo 2;
 use experimental 'signatures';
 use stable 'postderef';
-use Types::Standard qw(Str Bool Num Int Object ArrayRef);
+use Types::Standard qw(Str Bool Num Int ArrayRef HashRef);
 use MooX::TypeTiny;
 
 =head1 NAME
@@ -63,7 +63,7 @@ The messages of the chat, this can be used to keep a chat memory
 
 has 'messages' => (
     is       => 'ro',
-    isa      => ArrayRef[Object],
+    isa      => ArrayRef[HashRef],
     required => 1,
 );
 
@@ -89,7 +89,7 @@ Additional model parameters listed in the documentation for the Modelfile such a
 
 has 'options' => (
     is       => 'ro',
-    isa      => Object,
+    isa      => HashRef,
 );
 
 =head2 C<< stream >>

diff --git a/lib/AI/Ollama/GenerateChatCompletionResponse.pm b/lib/AI/Ollama/GenerateChatCompletionResponse.pm
@@ -4,7 +4,7 @@ use 5.020;
 use Moo 2;
 use experimental 'signatures';
 use stable 'postderef';
-use Types::Standard qw(Str Bool Num Int Object ArrayRef);
+use Types::Standard qw(Str Bool Num Int ArrayRef HashRef);
 use MooX::TypeTiny;
 
 =head1 NAME
@@ -86,7 +86,7 @@ A message in the chat endpoint
 
 has 'message' => (
     is       => 'ro',
-    isa      => Object,
+    isa      => HashRef,
 );
 
 =head2 C<< model >>

diff --git a/lib/AI/Ollama/GenerateCompletionRequest.pm b/lib/AI/Ollama/GenerateCompletionRequest.pm
@@ -4,7 +4,7 @@ use 5.020;
 use Moo 2;
 use experimental 'signatures';
 use stable 'postderef';
-use Types::Standard qw(Str Bool Num Int Object ArrayRef);
+use Types::Standard qw(Str Bool Num Int ArrayRef HashRef);
 use MooX::TypeTiny;
 
 =head1 NAME
@@ -99,7 +99,7 @@ Additional model parameters listed in the documentation for the Modelfile such a
 
 has 'options' => (
     is       => 'ro',
-    isa      => Object,
+    isa      => HashRef,
 );
 
 =head2 C<< prompt >>

diff --git a/lib/AI/Ollama/GenerateCompletionResponse.pm b/lib/AI/Ollama/GenerateCompletionResponse.pm
@@ -4,7 +4,7 @@ use 5.020;
 use Moo 2;
 use experimental 'signatures';
 use stable 'postderef';
-use Types::Standard qw(Str Bool Num Int Object ArrayRef);
+use Types::Standard qw(Str Bool Num Int ArrayRef HashRef);
 use MooX::TypeTiny;
 
 =head1 NAME

diff --git a/lib/AI/Ollama/GenerateEmbeddingRequest.pm b/lib/AI/Ollama/GenerateEmbeddingRequest.pm
@@ -4,7 +4,7 @@ use 5.020;
 use Moo 2;
 use experimental 'signatures';
 use stable 'postderef';
-use Types::Standard qw(Str Bool Num Int Object ArrayRef);
+use Types::Standard qw(Str Bool Num Int ArrayRef HashRef);
 use MooX::TypeTiny;
 
 =head1 NAME
@@ -46,7 +46,7 @@ Additional model parameters listed in the documentation for the Modelfile such a
 
 has 'options' => (
     is       => 'ro',
-    isa      => Object,
+    isa      => HashRef,
 );
 
 =head2 C<< prompt >>

diff --git a/lib/AI/Ollama/GenerateEmbeddingResponse.pm b/lib/AI/Ollama/GenerateEmbeddingResponse.pm
@@ -4,7 +4,7 @@ use 5.020;
 use Moo 2;
 use experimental 'signatures';
 use stable 'postderef';
-use Types::Standard qw(Str Bool Num Int Object ArrayRef);
+use Types::Standard qw(Str Bool Num Int ArrayRef HashRef);
 use MooX::TypeTiny;
 
 =head1 NAME

diff --git a/lib/AI/Ollama/Message.pm b/lib/AI/Ollama/Message.pm
@@ -4,7 +4,7 @@ use 5.020;
 use Moo 2;
 use experimental 'signatures';
 use stable 'postderef';
-use Types::Standard qw(Str Bool Num Int Object ArrayRef);
+use Types::Standard qw(Str Bool Num Int ArrayRef HashRef);
 use MooX::TypeTiny;
 
 =head1 NAME

diff --git a/lib/AI/Ollama/Model.pm b/lib/AI/Ollama/Model.pm
@@ -4,7 +4,7 @@ use 5.020;
 use Moo 2;
 use experimental 'signatures';
 use stable 'postderef';
-use Types::Standard qw(Str Bool Num Int Object ArrayRef);
+use Types::Standard qw(Str Bool Num Int ArrayRef HashRef);
 use MooX::TypeTiny;
 
 =head1 NAME

diff --git a/lib/AI/Ollama/ModelInfo.pm b/lib/AI/Ollama/ModelInfo.pm
@@ -4,7 +4,7 @@ use 5.020;
 use Moo 2;
 use experimental 'signatures';
 use stable 'postderef';
-use Types::Standard qw(Str Bool Num Int Object ArrayRef);
+use Types::Standard qw(Str Bool Num Int ArrayRef HashRef);
 use MooX::TypeTiny;
 
 =head1 NAME

diff --git a/lib/AI/Ollama/ModelInfoRequest.pm b/lib/AI/Ollama/ModelInfoRequest.pm
@@ -4,7 +4,7 @@ use 5.020;
 use Moo 2;
 use experimental 'signatures';
 use stable 'postderef';
-use Types::Standard qw(Str Bool Num Int Object ArrayRef);
+use Types::Standard qw(Str Bool Num Int ArrayRef HashRef);
 use MooX::TypeTiny;
 
 =head1 NAME

diff --git a/lib/AI/Ollama/ModelsResponse.pm b/lib/AI/Ollama/ModelsResponse.pm
@@ -4,7 +4,7 @@ use 5.020;
 use Moo 2;
 use experimental 'signatures';
 use stable 'postderef';
-use Types::Standard qw(Str Bool Num Int Object ArrayRef);
+use Types::Standard qw(Str Bool Num Int ArrayRef HashRef);
 use MooX::TypeTiny;
 
 =head1 NAME
@@ -32,7 +32,7 @@ List of models available locally.
 
 has 'models' => (
     is       => 'ro',
-    isa      => ArrayRef[Object],
+    isa      => ArrayRef[HashRef],
 );
 
 

diff --git a/lib/AI/Ollama/PullModelRequest.pm b/lib/AI/Ollama/PullModelRequest.pm
@@ -4,7 +4,7 @@ use 5.020;
 use Moo 2;
 use experimental 'signatures';
 use stable 'postderef';
-use Types::Standard qw(Str Bool Num Int Object ArrayRef);
+use Types::Standard qw(Str Bool Num Int ArrayRef HashRef);
 use MooX::TypeTiny;
 
 =head1 NAME

diff --git a/lib/AI/Ollama/PullModelResponse.pm b/lib/AI/Ollama/PullModelResponse.pm
@@ -4,7 +4,7 @@ use 5.020;
 use Moo 2;
 use experimental 'signatures';
 use stable 'postderef';
-use Types::Standard qw(Str Bool Num Int Object ArrayRef);
+use Types::Standard qw(Str Bool Num Int ArrayRef HashRef);
 use MooX::TypeTiny;
 
 =head1 NAME

diff --git a/lib/AI/Ollama/PushModelRequest.pm b/lib/AI/Ollama/PushModelRequest.pm
@@ -4,7 +4,7 @@ use 5.020;
 use Moo 2;
 use experimental 'signatures';
 use stable 'postderef';
-use Types::Standard qw(Str Bool Num Int Object ArrayRef);
+use Types::Standard qw(Str Bool Num Int ArrayRef HashRef);
 use MooX::TypeTiny;
 
 =head1 NAME

diff --git a/lib/AI/Ollama/PushModelResponse.pm b/lib/AI/Ollama/PushModelResponse.pm
@@ -4,7 +4,7 @@ use 5.020;
 use Moo 2;
 use experimental 'signatures';
 use stable 'postderef';
-use Types::Standard qw(Str Bool Num Int Object ArrayRef);
+use Types::Standard qw(Str Bool Num Int ArrayRef HashRef);
 use MooX::TypeTiny;
 
 =head1 NAME

diff --git a/lib/AI/Ollama/RequestOptions.pm b/lib/AI/Ollama/RequestOptions.pm
@@ -4,7 +4,7 @@ use 5.020;
 use Moo 2;
 use experimental 'signatures';
 use stable 'postderef';
-use Types::Standard qw(Str Bool Num Int Object ArrayRef);
+use Types::Standard qw(Str Bool Num Int ArrayRef HashRef);
 use MooX::TypeTiny;
 
 =head1 NAME