Export types correctly

Author: AndyTitu

example/example.py

@@ -2,7 +2,6 @@
 import os
 from onepassword import *
 
-
 async def main():
     # Gets your service account token from the OP_SERVICE_ACCOUNT_TOKEN environment variable.
     token = os.getenv("OP_SERVICE_ACCOUNT_TOKEN")
@@ -16,15 +15,15 @@ async def main():
     )
 
     # Retrieves a secret from 1Password. Takes a secret reference as input and returns the secret to which it points.
-    value = await client.secrets.resolve("op://vault/item/field")
-    print(value)
+    # value = await client.secrets.resolve("op://vault/item/field")
+    # print(value)
 
     # Create an Item and add it to your vault.
     to_create = Item(
         id="",
         title="MyName",
         category="Login",
-        vault_id="vault_id",
+        vault_id="q73bqltug6xoegr3wkk2zkenoq",
         fields=[
             ItemField(
                 id="username",
@@ -48,7 +47,7 @@ async def main():
     print(dict(created_item))
 
     # Retrieve an item from your vault.
-    item = await client.items.get("vault_id", created_item.id)
+    item = await client.items.get(created_item.vault_id, created_item.id)
 
     print(dict(item))
 
@@ -59,7 +58,7 @@ async def main():
     print(dict(updated_item))
 
     # Delete a item from your vault.
-    await client.items.delete("vault_id", updated_item.id)
+    await client.items.delete(created_item.vault_id, updated_item.id)
 
 
 if __name__ == "__main__":

src/onepassword/__init__.py

@@ -5,6 +5,7 @@
 from .secrets import Secrets
 from .items import Items
 
+import sys, inspect, typing
 
 __all__ = [
     "Client",
@@ -14,5 +15,6 @@
     "DEFAULT_INTEGRATION_VERSION",
 ]
 
-if hasattr(types, "__all__"):
-    __all__ += types.__all__
+for name, obj in inspect.getmembers(sys.modules["onepassword.types"]):
+    if inspect.isclass(obj) or type(eval(name)) == typing._LiteralGenericAlias:
+        __all__.append(name)

src/onepassword/types.py

@@ -2,21 +2,10 @@
 Generated by typeshare 1.9.2
 """
 
-from __future__ import annotations
-
 from pydantic import BaseModel
 from typing import List, Literal, Optional
 
 
-class Item(BaseModel):
-    id: str
-    title: str
-    category: ItemCategory
-    vault_id: str
-    fields: List[ItemField]
-    sections: List[ItemSection]
-
-
 ItemCategory = Literal[
     "Login",
     "SecureNote",
@@ -45,6 +34,9 @@ class Item(BaseModel):
 ]
 
 
+ItemFieldType = Literal["Text", "Concealed", "Unsupported"]
+
+
 class ItemField(BaseModel):
     id: str
     title: str
@@ -53,9 +45,15 @@ class ItemField(BaseModel):
     value: str
 
 
-ItemFieldType = Literal["Text", "Concealed", "Unsupported"]
+class ItemSection(BaseModel):
+    id: str
+    title: str
 
 
-class ItemSection(BaseModel):
+class Item(BaseModel):
     id: str
     title: str
+    category: ItemCategory
+    vault_id: str
+    fields: List[ItemField]
+    sections: List[ItemSection]