moving protos to rai/pb (#33)

README.md

@@ -61,11 +61,7 @@ You can copy `config.spec` from the root of this repo and modify as needed.
 ```shell
 go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
 export PATH=$PATH:$HOME/go/bin
-protoc --proto_path=/path/to/rai-sdk-go/protos/proto \
-    --go_out=/path/to/rai-sdk-go/protos \
-    --go_opt=Mschema.proto=./generated \
-    --go_opt=Mmessage.proto=./generated \
-    /path/to/rai-sdk-go/protos/proto/*.proto
+protoc -I protos --go_out=. --go_opt=Mschema.proto=./rai/pb --go_opt=Mmessage.proto=./rai/pb protos/*.proto
 ```
 
 ## Examples

rai/client.go

@@ -33,7 +33,7 @@ import (
 
 	"github.com/apache/arrow/go/v7/arrow/ipc"
 	"github.com/pkg/errors"
-	"github.com/relationalai/rai-sdk-go/protos/generated"
+	"github.com/relationalai/rai-sdk-go/rai/pb"
 	"google.golang.org/protobuf/proto"
 )
 
@@ -330,7 +330,7 @@ func unmarshal(rsp *http.Response, result interface{}) error {
 		}
 
 		return errors.Errorf("unhandled unmarshal type %T", result)
-	case generated.MetadataInfo:
+	case pb.MetadataInfo:
 		srcValues := reflect.ValueOf(data)
 		dstValues.Set(srcValues)
 		return nil
@@ -451,7 +451,7 @@ func parseHttpResponse(rsp *http.Response) (interface{}, error) {
 		boundary := params["boundary"]
 		return parseMultipartResponse(data, boundary)
 	} else if mediaType == "application/x-protobuf" {
-		var metadataInfo generated.MetadataInfo
+		var metadataInfo pb.MetadataInfo
 		err := proto.Unmarshal(data, &metadataInfo)
 		if err != nil {
 			return nil, err
@@ -492,7 +492,7 @@ func (c *Client) request(
 // readTransactionAsyncFiles reads the transaction async results from TransactionAsyncFiles
 func readTransactionAsyncFiles(files []TransactionAsyncFile) (*TransactionAsyncResult, error) {
 	var txn TransactionAsyncResponse
-	var metadata generated.MetadataInfo
+	var metadata pb.MetadataInfo
 	var problems []interface{}
 
 	for _, file := range files {
@@ -1304,8 +1304,8 @@ func (c *Client) GetTransactionResults(id string) ([]ArrowRelation, error) {
 	return result, err
 }
 
-func (c *Client) GetTransactionMetadata(id string) (generated.MetadataInfo, error) {
-	var result generated.MetadataInfo
+func (c *Client) GetTransactionMetadata(id string) (pb.MetadataInfo, error) {
+	var result pb.MetadataInfo
 	headers := map[string]string{
 		"Accept": "application/x-protobuf",
 	}

rai/client_test.go

@@ -24,7 +24,7 @@ import (
 	"testing"
 
 	"github.com/google/uuid"
-	"github.com/relationalai/rai-sdk-go/protos/generated"
+	"github.com/relationalai/rai-sdk-go/rai/pb"
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/protobuf/proto"
 )
@@ -337,7 +337,7 @@ func TestExecuteAsync(t *testing.T) {
 
 	assert.Equal(t, rsp.Results[0].Table, expectedResults[0].Table)
 
-	var expectedMetadata generated.MetadataInfo
+	var expectedMetadata pb.MetadataInfo
 	data, _ := os.ReadFile("./metadata.pb")
 	proto.Unmarshal(data, &expectedMetadata)
 

rai/models.go

@@ -17,7 +17,7 @@ package rai
 import (
 	"time"
 
-	"github.com/relationalai/rai-sdk-go/protos/generated"
+	"github.com/relationalai/rai-sdk-go/rai/pb"
 )
 
 // REST API v1
@@ -303,6 +303,6 @@ type TransactionAsyncResult struct {
 	GotCompleteResult bool
 	Transaction       TransactionAsyncResponse
 	Results           []ArrowRelation
-	Metadata          generated.MetadataInfo
+	Metadata          pb.MetadataInfo
 	Problems          []interface{}
 }