"examples/modelfile-tweetwriter/Modelfile" did not exist on "10885986b8bc98218ca9034b5a7c28900276fc25"
openai_test.go 14.2 KB
Newer Older
xuxzh1's avatar
init  
xuxzh1 committed
1
2
3
4
5
6
7
8
9
package openai

import (
	"bytes"
	"encoding/base64"
	"encoding/json"
	"io"
	"net/http"
	"net/http/httptest"
xuxzh1's avatar
update  
xuxzh1 committed
10
	"reflect"
xuxzh1's avatar
init  
xuxzh1 committed
11
12
13
14
15
	"strings"
	"testing"
	"time"

	"github.com/gin-gonic/gin"
xuxzh1's avatar
update  
xuxzh1 committed
16
	"github.com/google/go-cmp/cmp"
xuxzh1's avatar
init  
xuxzh1 committed
17
18
19
20
21

	"github.com/ollama/ollama/api"
)

const (
xuxzh1's avatar
update  
xuxzh1 committed
22
23
	prefix = `data:image/jpeg;base64,`
	image  = `iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=`
xuxzh1's avatar
init  
xuxzh1 committed
24
25
)

xuxzh1's avatar
update  
xuxzh1 committed
26
27
28
29
var (
	False = false
	True  = true
)
xuxzh1's avatar
init  
xuxzh1 committed
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44

func captureRequestMiddleware(capturedRequest any) gin.HandlerFunc {
	return func(c *gin.Context) {
		bodyBytes, _ := io.ReadAll(c.Request.Body)
		c.Request.Body = io.NopCloser(bytes.NewReader(bodyBytes))
		err := json.Unmarshal(bodyBytes, capturedRequest)
		if err != nil {
			c.AbortWithStatusJSON(http.StatusInternalServerError, "failed to unmarshal request")
		}
		c.Next()
	}
}

func TestChatMiddleware(t *testing.T) {
	type testCase struct {
xuxzh1's avatar
update  
xuxzh1 committed
45
46
47
48
		name string
		body string
		req  api.ChatRequest
		err  ErrorResponse
xuxzh1's avatar
init  
xuxzh1 committed
49
50
51
52
53
54
	}

	var capturedRequest *api.ChatRequest

	testCases := []testCase{
		{
xuxzh1's avatar
update  
xuxzh1 committed
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
			name: "chat handler",
			body: `{
				"model": "test-model",
				"messages": [
					{"role": "user", "content": "Hello"}
				]
			}`,
			req: api.ChatRequest{
				Model: "test-model",
				Messages: []api.Message{
					{
						Role:    "user",
						Content: "Hello",
					},
				},
				Options: map[string]any{
					"temperature": 1.0,
					"top_p":       1.0,
				},
				Stream: &False,
xuxzh1's avatar
init  
xuxzh1 committed
75
			},
xuxzh1's avatar
update  
xuxzh1 committed
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
		},
		{
			name: "chat handler with options",
			body: `{
				"model": "test-model",
				"messages": [
					{"role": "user", "content": "Hello"}
				],
				"stream":            true,
				"max_tokens":        999,
				"seed":              123,
				"stop":              ["\n", "stop"],
				"temperature":       3.0,
				"frequency_penalty": 4.0,
				"presence_penalty":  5.0,
				"top_p":             6.0,
				"response_format":   {"type": "json_object"}
			}`,
			req: api.ChatRequest{
				Model: "test-model",
				Messages: []api.Message{
					{
						Role:    "user",
						Content: "Hello",
					},
				},
				Options: map[string]any{
					"num_predict":       999.0, // float because JSON doesn't distinguish between float and int
					"seed":              123.0,
					"stop":              []any{"\n", "stop"},
					"temperature":       3.0,
					"frequency_penalty": 4.0,
					"presence_penalty":  5.0,
					"top_p":             6.0,
				},
xuxzh1's avatar
update  
xuxzh1 committed
111
				Format: json.RawMessage(`"json"`),
xuxzh1's avatar
update  
xuxzh1 committed
112
				Stream: &True,
xuxzh1's avatar
init  
xuxzh1 committed
113
114
115
			},
		},
		{
xuxzh1's avatar
update  
xuxzh1 committed
116
117
118
119
120
121
122
123
124
125
			name: "chat handler with image content",
			body: `{
				"model": "test-model",
				"messages": [
					{
						"role": "user",
						"content": [
							{
								"type": "text",
								"text": "Hello"
xuxzh1's avatar
init  
xuxzh1 committed
126
							},
xuxzh1's avatar
update  
xuxzh1 committed
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
							{
								"type": "image_url",
								"image_url": {
									"url": "` + prefix + image + `"
								}
							}
						]
					}
				]
			}`,
			req: api.ChatRequest{
				Model: "test-model",
				Messages: []api.Message{
					{
						Role:    "user",
						Content: "Hello",
					},
					{
						Role: "user",
						Images: []api.ImageData{
							func() []byte {
								img, _ := base64.StdEncoding.DecodeString(image)
								return img
							}(),
xuxzh1's avatar
init  
xuxzh1 committed
151
152
						},
					},
xuxzh1's avatar
update  
xuxzh1 committed
153
154
155
156
157
158
				},
				Options: map[string]any{
					"temperature": 1.0,
					"top_p":       1.0,
				},
				Stream: &False,
xuxzh1's avatar
init  
xuxzh1 committed
159
			},
xuxzh1's avatar
update  
xuxzh1 committed
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
		},
		{
			name: "chat handler with tools",
			body: `{
				"model": "test-model",
				"messages": [
					{"role": "user", "content": "What's the weather like in Paris Today?"},
					{"role": "assistant", "tool_calls": [{"id": "id", "type": "function", "function": {"name": "get_current_weather", "arguments": "{\"location\": \"Paris, France\", \"format\": \"celsius\"}"}}]}
				]
			}`,
			req: api.ChatRequest{
				Model: "test-model",
				Messages: []api.Message{
					{
						Role:    "user",
						Content: "What's the weather like in Paris Today?",
					},
					{
						Role: "assistant",
						ToolCalls: []api.ToolCall{
							{
								Function: api.ToolCallFunction{
									Name: "get_current_weather",
									Arguments: map[string]interface{}{
										"location": "Paris, France",
										"format":   "celsius",
									},
								},
							},
						},
					},
				},
				Options: map[string]any{
					"temperature": 1.0,
					"top_p":       1.0,
				},
				Stream: &False,
xuxzh1's avatar
init  
xuxzh1 committed
197
198
199
			},
		},
		{
xuxzh1's avatar
update  
xuxzh1 committed
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
			name: "chat handler with streaming tools",
			body: `{
				"model": "test-model",
				"messages": [
					{"role": "user", "content": "What's the weather like in Paris?"}
				],
				"stream": true,
				"tools": [{
					"type": "function",
					"function": {
						"name": "get_weather",
						"description": "Get the current weather",
						"parameters": {
							"type": "object",
							"required": ["location"],
							"properties": {
								"location": {
									"type": "string",
									"description": "The city and state"
								},
								"unit": {
									"type": "string",
									"enum": ["celsius", "fahrenheit"]
								}
							}
						}
					}
				}]
			}`,
			req: api.ChatRequest{
				Model: "test-model",
				Messages: []api.Message{
					{
						Role:    "user",
						Content: "What's the weather like in Paris?",
					},
				},
				Tools: []api.Tool{
					{
						Type: "function",
						Function: api.ToolFunction{
							Name:        "get_weather",
							Description: "Get the current weather",
							Parameters: struct {
								Type       string   `json:"type"`
								Required   []string `json:"required"`
								Properties map[string]struct {
									Type        string   `json:"type"`
									Description string   `json:"description"`
									Enum        []string `json:"enum,omitempty"`
								} `json:"properties"`
xuxzh1's avatar
init  
xuxzh1 committed
251
							}{
xuxzh1's avatar
update  
xuxzh1 committed
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
								Type:     "object",
								Required: []string{"location"},
								Properties: map[string]struct {
									Type        string   `json:"type"`
									Description string   `json:"description"`
									Enum        []string `json:"enum,omitempty"`
								}{
									"location": {
										Type:        "string",
										Description: "The city and state",
									},
									"unit": {
										Type: "string",
										Enum: []string{"celsius", "fahrenheit"},
									},
								},
xuxzh1's avatar
init  
xuxzh1 committed
268
							},
xuxzh1's avatar
update  
xuxzh1 committed
269
						},
xuxzh1's avatar
init  
xuxzh1 committed
270
					},
xuxzh1's avatar
update  
xuxzh1 committed
271
272
273
274
275
276
				},
				Options: map[string]any{
					"temperature": 1.0,
					"top_p":       1.0,
				},
				Stream: &True,
xuxzh1's avatar
init  
xuxzh1 committed
277
278
279
			},
		},
		{
xuxzh1's avatar
update  
xuxzh1 committed
280
281
282
283
284
285
286
287
288
289
290
291
			name: "chat handler error forwarding",
			body: `{
				"model": "test-model",
				"messages": [
					{"role": "user", "content": 2}
				]
			}`,
			err: ErrorResponse{
				Error: Error{
					Message: "invalid message content type: float64",
					Type:    "invalid_request_error",
				},
xuxzh1's avatar
init  
xuxzh1 committed
292
293
294
295
296
297
298
299
300
301
302
303
304
305
			},
		},
	}

	endpoint := func(c *gin.Context) {
		c.Status(http.StatusOK)
	}

	gin.SetMode(gin.TestMode)
	router := gin.New()
	router.Use(ChatMiddleware(), captureRequestMiddleware(&capturedRequest))
	router.Handle(http.MethodPost, "/api/chat", endpoint)

	for _, tc := range testCases {
xuxzh1's avatar
update  
xuxzh1 committed
306
307
308
		t.Run(tc.name, func(t *testing.T) {
			req, _ := http.NewRequest(http.MethodPost, "/api/chat", strings.NewReader(tc.body))
			req.Header.Set("Content-Type", "application/json")
xuxzh1's avatar
init  
xuxzh1 committed
309

xuxzh1's avatar
update  
xuxzh1 committed
310
			defer func() { capturedRequest = nil }()
xuxzh1's avatar
init  
xuxzh1 committed
311
312
313
314

			resp := httptest.NewRecorder()
			router.ServeHTTP(resp, req)

xuxzh1's avatar
update  
xuxzh1 committed
315
316
317
318
319
			var errResp ErrorResponse
			if resp.Code != http.StatusOK {
				if err := json.Unmarshal(resp.Body.Bytes(), &errResp); err != nil {
					t.Fatal(err)
				}
xuxzh1's avatar
update  
xuxzh1 committed
320
				return
xuxzh1's avatar
update  
xuxzh1 committed
321
			}
xuxzh1's avatar
update  
xuxzh1 committed
322
323
			if diff := cmp.Diff(&tc.req, capturedRequest); diff != "" {
				t.Fatalf("requests did not match: %+v", diff)
xuxzh1's avatar
update  
xuxzh1 committed
324
			}
xuxzh1's avatar
update  
xuxzh1 committed
325
326
			if diff := cmp.Diff(tc.err, errResp); diff != "" {
				t.Fatalf("errors did not match for %s:\n%s", tc.name, diff)
xuxzh1's avatar
update  
xuxzh1 committed
327
			}
xuxzh1's avatar
init  
xuxzh1 committed
328
329
330
331
332
333
		})
	}
}

func TestCompletionsMiddleware(t *testing.T) {
	type testCase struct {
xuxzh1's avatar
update  
xuxzh1 committed
334
335
336
337
		name string
		body string
		req  api.GenerateRequest
		err  ErrorResponse
xuxzh1's avatar
init  
xuxzh1 committed
338
339
340
341
342
343
	}

	var capturedRequest *api.GenerateRequest

	testCases := []testCase{
		{
xuxzh1's avatar
update  
xuxzh1 committed
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
			name: "completions handler",
			body: `{
				"model": "test-model",
				"prompt": "Hello",
				"temperature": 0.8,
				"stop": ["\n", "stop"],
				"suffix": "suffix"
			}`,
			req: api.GenerateRequest{
				Model:  "test-model",
				Prompt: "Hello",
				Options: map[string]any{
					"frequency_penalty": 0.0,
					"presence_penalty":  0.0,
					"temperature":       0.8,
					"top_p":             1.0,
					"stop":              []any{"\n", "stop"},
				},
				Suffix: "suffix",
				Stream: &False,
xuxzh1's avatar
init  
xuxzh1 committed
364
365
366
			},
		},
		{
xuxzh1's avatar
update  
xuxzh1 committed
367
368
369
370
371
372
373
374
375
376
377
378
379
			name: "completions handler error forwarding",
			body: `{
				"model": "test-model",
				"prompt": "Hello",
				"temperature": null,
				"stop": [1, 2],
				"suffix": "suffix"
			}`,
			err: ErrorResponse{
				Error: Error{
					Message: "invalid type for 'stop' field: float64",
					Type:    "invalid_request_error",
				},
xuxzh1's avatar
init  
xuxzh1 committed
380
381
382
383
384
385
386
387
388
389
390
391
392
393
			},
		},
	}

	endpoint := func(c *gin.Context) {
		c.Status(http.StatusOK)
	}

	gin.SetMode(gin.TestMode)
	router := gin.New()
	router.Use(CompletionsMiddleware(), captureRequestMiddleware(&capturedRequest))
	router.Handle(http.MethodPost, "/api/generate", endpoint)

	for _, tc := range testCases {
xuxzh1's avatar
update  
xuxzh1 committed
394
395
396
		t.Run(tc.name, func(t *testing.T) {
			req, _ := http.NewRequest(http.MethodPost, "/api/generate", strings.NewReader(tc.body))
			req.Header.Set("Content-Type", "application/json")
xuxzh1's avatar
init  
xuxzh1 committed
397
398
399
400

			resp := httptest.NewRecorder()
			router.ServeHTTP(resp, req)

xuxzh1's avatar
update  
xuxzh1 committed
401
402
403
404
405
406
407
408
409
410
411
412
413
414
			var errResp ErrorResponse
			if resp.Code != http.StatusOK {
				if err := json.Unmarshal(resp.Body.Bytes(), &errResp); err != nil {
					t.Fatal(err)
				}
			}

			if capturedRequest != nil && !reflect.DeepEqual(tc.req, *capturedRequest) {
				t.Fatal("requests did not match")
			}

			if !reflect.DeepEqual(tc.err, errResp) {
				t.Fatal("errors did not match")
			}
xuxzh1's avatar
init  
xuxzh1 committed
415
416
417
418
419
420
421
422

			capturedRequest = nil
		})
	}
}

func TestEmbeddingsMiddleware(t *testing.T) {
	type testCase struct {
xuxzh1's avatar
update  
xuxzh1 committed
423
424
425
426
		name string
		body string
		req  api.EmbedRequest
		err  ErrorResponse
xuxzh1's avatar
init  
xuxzh1 committed
427
428
429
430
431
432
	}

	var capturedRequest *api.EmbedRequest

	testCases := []testCase{
		{
xuxzh1's avatar
update  
xuxzh1 committed
433
434
435
436
437
438
439
440
			name: "embed handler single input",
			body: `{
				"input": "Hello",
				"model": "test-model"
			}`,
			req: api.EmbedRequest{
				Input: "Hello",
				Model: "test-model",
xuxzh1's avatar
init  
xuxzh1 committed
441
442
443
			},
		},
		{
xuxzh1's avatar
update  
xuxzh1 committed
444
445
446
447
448
449
450
451
			name: "embed handler batch input",
			body: `{
				"input": ["Hello", "World"],
				"model": "test-model"
			}`,
			req: api.EmbedRequest{
				Input: []any{"Hello", "World"},
				Model: "test-model",
xuxzh1's avatar
init  
xuxzh1 committed
452
453
454
			},
		},
		{
xuxzh1's avatar
update  
xuxzh1 committed
455
456
457
458
459
460
461
462
463
			name: "embed handler error forwarding",
			body: `{
				"model": "test-model"
			}`,
			err: ErrorResponse{
				Error: Error{
					Message: "invalid input",
					Type:    "invalid_request_error",
				},
xuxzh1's avatar
init  
xuxzh1 committed
464
465
466
467
468
469
470
471
472
473
474
475
476
477
			},
		},
	}

	endpoint := func(c *gin.Context) {
		c.Status(http.StatusOK)
	}

	gin.SetMode(gin.TestMode)
	router := gin.New()
	router.Use(EmbeddingsMiddleware(), captureRequestMiddleware(&capturedRequest))
	router.Handle(http.MethodPost, "/api/embed", endpoint)

	for _, tc := range testCases {
xuxzh1's avatar
update  
xuxzh1 committed
478
479
480
		t.Run(tc.name, func(t *testing.T) {
			req, _ := http.NewRequest(http.MethodPost, "/api/embed", strings.NewReader(tc.body))
			req.Header.Set("Content-Type", "application/json")
xuxzh1's avatar
init  
xuxzh1 committed
481
482
483
484

			resp := httptest.NewRecorder()
			router.ServeHTTP(resp, req)

xuxzh1's avatar
update  
xuxzh1 committed
485
486
487
488
489
490
491
492
493
494
495
496
497
498
			var errResp ErrorResponse
			if resp.Code != http.StatusOK {
				if err := json.Unmarshal(resp.Body.Bytes(), &errResp); err != nil {
					t.Fatal(err)
				}
			}

			if capturedRequest != nil && !reflect.DeepEqual(tc.req, *capturedRequest) {
				t.Fatal("requests did not match")
			}

			if !reflect.DeepEqual(tc.err, errResp) {
				t.Fatal("errors did not match")
			}
xuxzh1's avatar
init  
xuxzh1 committed
499
500
501
502
503
504

			capturedRequest = nil
		})
	}
}

xuxzh1's avatar
update  
xuxzh1 committed
505
func TestListMiddleware(t *testing.T) {
xuxzh1's avatar
init  
xuxzh1 committed
506
	type testCase struct {
xuxzh1's avatar
update  
xuxzh1 committed
507
508
509
		name     string
		endpoint func(c *gin.Context)
		resp     string
xuxzh1's avatar
init  
xuxzh1 committed
510
511
512
513
	}

	testCases := []testCase{
		{
xuxzh1's avatar
update  
xuxzh1 committed
514
515
			name: "list handler",
			endpoint: func(c *gin.Context) {
xuxzh1's avatar
init  
xuxzh1 committed
516
517
518
				c.JSON(http.StatusOK, api.ListResponse{
					Models: []api.ListModelResponse{
						{
xuxzh1's avatar
update  
xuxzh1 committed
519
520
							Name:       "test-model",
							ModifiedAt: time.Unix(int64(1686935002), 0).UTC(),
xuxzh1's avatar
init  
xuxzh1 committed
521
522
523
524
						},
					},
				})
			},
xuxzh1's avatar
update  
xuxzh1 committed
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
			resp: `{
				"object": "list",
				"data": [
					{
						"id": "test-model",
						"object": "model",
						"created": 1686935002,
						"owned_by": "library"
					}
				]
			}`,
		},
		{
			name: "list handler empty output",
			endpoint: func(c *gin.Context) {
				c.JSON(http.StatusOK, api.ListResponse{})
			},
			resp: `{
				"object": "list",
				"data": null
			}`,
		},
	}
xuxzh1's avatar
init  
xuxzh1 committed
548

xuxzh1's avatar
update  
xuxzh1 committed
549
	gin.SetMode(gin.TestMode)
xuxzh1's avatar
init  
xuxzh1 committed
550

xuxzh1's avatar
update  
xuxzh1 committed
551
552
553
554
555
	for _, tc := range testCases {
		router := gin.New()
		router.Use(ListMiddleware())
		router.Handle(http.MethodGet, "/api/tags", tc.endpoint)
		req, _ := http.NewRequest(http.MethodGet, "/api/tags", nil)
xuxzh1's avatar
init  
xuxzh1 committed
556

xuxzh1's avatar
update  
xuxzh1 committed
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
		resp := httptest.NewRecorder()
		router.ServeHTTP(resp, req)

		var expected, actual map[string]any
		err := json.Unmarshal([]byte(tc.resp), &expected)
		if err != nil {
			t.Fatalf("failed to unmarshal expected response: %v", err)
		}

		err = json.Unmarshal(resp.Body.Bytes(), &actual)
		if err != nil {
			t.Fatalf("failed to unmarshal actual response: %v", err)
		}

		if !reflect.DeepEqual(expected, actual) {
			t.Errorf("responses did not match\nExpected: %+v\nActual: %+v", expected, actual)
		}
	}
}

func TestRetrieveMiddleware(t *testing.T) {
	type testCase struct {
		name     string
		endpoint func(c *gin.Context)
		resp     string
	}

	testCases := []testCase{
xuxzh1's avatar
init  
xuxzh1 committed
585
		{
xuxzh1's avatar
update  
xuxzh1 committed
586
587
			name: "retrieve handler",
			endpoint: func(c *gin.Context) {
xuxzh1's avatar
init  
xuxzh1 committed
588
				c.JSON(http.StatusOK, api.ShowResponse{
xuxzh1's avatar
update  
xuxzh1 committed
589
					ModifiedAt: time.Unix(int64(1686935002), 0).UTC(),
xuxzh1's avatar
init  
xuxzh1 committed
590
591
				})
			},
xuxzh1's avatar
update  
xuxzh1 committed
592
593
594
595
596
597
598
599
600
601
602
			resp: `{
				"id":"test-model",
				"object":"model",
				"created":1686935002,
				"owned_by":"library"}
			`,
		},
		{
			name: "retrieve handler error forwarding",
			endpoint: func(c *gin.Context) {
				c.JSON(http.StatusBadRequest, gin.H{"error": "model not found"})
xuxzh1's avatar
init  
xuxzh1 committed
603
			},
xuxzh1's avatar
update  
xuxzh1 committed
604
605
606
607
608
609
610
611
			resp: `{
				"error": {
				  "code": null,
				  "message": "model not found",
				  "param": null,
				  "type": "api_error"
				}
			}`,
xuxzh1's avatar
init  
xuxzh1 committed
612
613
614
615
616
617
		},
	}

	gin.SetMode(gin.TestMode)

	for _, tc := range testCases {
xuxzh1's avatar
update  
xuxzh1 committed
618
619
620
621
		router := gin.New()
		router.Use(RetrieveMiddleware())
		router.Handle(http.MethodGet, "/api/show/:model", tc.endpoint)
		req, _ := http.NewRequest(http.MethodGet, "/api/show/test-model", nil)
xuxzh1's avatar
init  
xuxzh1 committed
622

xuxzh1's avatar
update  
xuxzh1 committed
623
624
		resp := httptest.NewRecorder()
		router.ServeHTTP(resp, req)
xuxzh1's avatar
init  
xuxzh1 committed
625

xuxzh1's avatar
update  
xuxzh1 committed
626
627
628
629
630
		var expected, actual map[string]any
		err := json.Unmarshal([]byte(tc.resp), &expected)
		if err != nil {
			t.Fatalf("failed to unmarshal expected response: %v", err)
		}
xuxzh1's avatar
init  
xuxzh1 committed
631

xuxzh1's avatar
update  
xuxzh1 committed
632
633
634
635
636
637
638
639
		err = json.Unmarshal(resp.Body.Bytes(), &actual)
		if err != nil {
			t.Fatalf("failed to unmarshal actual response: %v", err)
		}

		if !reflect.DeepEqual(expected, actual) {
			t.Errorf("responses did not match\nExpected: %+v\nActual: %+v", expected, actual)
		}
xuxzh1's avatar
init  
xuxzh1 committed
640
	}
xuxzh1's avatar
update  
xuxzh1 committed
641
}