diff --git a/llama-index-cli/llama_index/cli/upgrade/mappings.json b/llama-index-cli/llama_index/cli/upgrade/mappings.json
index 1316da31b1b2a4446d57a548b3bfd0a2df6995df..86b7b3ae5417fc08fbe40e145aa430d82b8bbf6e 100644
--- a/llama-index-cli/llama_index/cli/upgrade/mappings.json
+++ b/llama-index-cli/llama_index/cli/upgrade/mappings.json
@@ -53,6 +53,7 @@
   "set_global_handler": "llama_index.core",
   "set_global_tokenizer": "llama_index.core",
   "get_tokenizer": "llama_index.core",
+  "Settings": "llama_index.core",
   "AgentRunner": "llama_index.core.agent",
   "ParallelAgentRunner": "llama_index.core.agent",
   "ReActAgentWorker": "llama_index.core.agent",
@@ -70,14 +71,6 @@
   "LlamaDebugHandler": "llama_index.core.callbacks",
   "TokenCountingHandler": "llama_index.core.callbacks",
   "trace_method": "llama_index.core.callbacks",
-  "deepeval_callback_handler": "llama_index.callbacks.deepeval",
-  "OpenInferenceCallbackHandler": "llama_index.callbacks.openinference",
-  "WandbCallbackHandler": "llama_index.callbacks.wandb",
-  "argilla_callback_handler": "llama_index.callbacks.argilla",
-  "honeyhive_callback_handler": "llama_index.callbacks.honeyhive",
-  "arize_phoenix_callback_handler": "llama_index.callbacks.arize_phoenix",
-  "AimCallback": "llama_index.callbacks.aim",
-  "PromptLayerHandler": "llama_index.callbacks.promptlayer",
   "SimpleChatEngine": "llama_index.core.chat_engine",
   "CondenseQuestionChatEngine": "llama_index.core.chat_engine",
   "ContextChatEngine": "llama_index.core.chat_engine",
@@ -92,6 +85,7 @@
   "BaseEmbedding": "llama_index.core.embeddings",
   "MultiModalEmbedding": "llama_index.core.embeddings",
   "Pooling": "llama_index.core.embeddings",
+  "resolve_embed_model": "llama_index.core.embeddings",
   "BaseEvaluator": "llama_index.core.evaluation",
   "AnswerRelevancyEvaluator": "llama_index.core.evaluation",
   "ContextRelevancyEvaluator": "llama_index.core.evaluation",
@@ -128,7 +122,7 @@
   "BaseExtractor": "llama_index.core.extractors",
   "PydanticProgramExtractor": "llama_index.core.extractors",
   "SimpleGraphStore": "llama_index.core.graph_stores",
-  "SummaryIndex": "llama_index.core",
+  "SummaryIndex": "llama_index.core.indices",
   "PandasIndex": "llama_index.core.indices",
   "SQLStructStoreIndex": "llama_index.core.indices",
   "MultiModalVectorStoreIndex": "llama_index.core.indices",
@@ -181,6 +175,7 @@
   "CompletionResponseGen": "llama_index.core.llms",
   "LLMMetadata": "llama_index.core.llms",
   "MessageRole": "llama_index.core.llms",
+  "MockLLM": "llama_index.core.llms",
   "BaseMemory": "llama_index.core.memory",
   "ChatMemoryBuffer": "llama_index.core.memory",
   "MultiModalLLMMetadata": "llama_index.core.multi_modal_llms",
@@ -203,6 +198,8 @@
   "UnstructuredElementNodeParser": "llama_index.core.node_parser",
   "get_leaf_nodes": "llama_index.core.node_parser",
   "get_root_nodes": "llama_index.core.node_parser",
+  "get_child_nodes": "llama_index.core.node_parser",
+  "get_deeper_nodes": "llama_index.core.node_parser",
   "# deprecated": "llama_index.core.node_parser",
   "for backwards compatibilitySimpleNodeParser": "llama_index.core.node_parser",
   "ObjectRetriever": "llama_index.core.objects",
@@ -269,15 +266,19 @@
   "AgentInputComponent": "llama_index.core.query_pipeline",
   "ArgPackComponent": "llama_index.core.query_pipeline",
   "FnComponent": "llama_index.core.query_pipeline",
+  "FunctionComponent": "llama_index.core.query_pipeline",
   "InputComponent": "llama_index.core.query_pipeline",
   "RouterComponent": "llama_index.core.query_pipeline",
   "ToolRunnerComponent": "llama_index.core.query_pipeline",
   "QueryPipeline": "llama_index.core.query_pipeline",
+  "CustomAgentComponent": "llama_index.core.query_pipeline",
+  "QueryComponent": "llama_index.core.query_pipeline",
+  "Link": "llama_index.core.query_pipeline",
+  "ChainableMixin": "llama_index.core.query_pipeline",
+  "CustomQueryComponent": "llama_index.core.query_pipeline",
   "LLMQuestionGenerator": "llama_index.core.question_gen",
   "SubQuestionOutputParser": "llama_index.core.question_gen",
   "ReaderConfig": "llama_index.core.readers",
-  "PDFReader": "llama_index.readers.file",
-  "HTMLTagReader": "llama_index.readers.file",
   "StringIterableReader": "llama_index.core.readers",
   "ResponseMode": "llama_index.core.response_synthesizers",
   "BaseSynthesizer": "llama_index.core.response_synthesizers",
@@ -336,6 +337,18 @@
   "FilterCondition": "llama_index.core.vector_stores",
   "FilterOperator": "llama_index.core.vector_stores",
   "SimpleVectorStore": "llama_index.core.vector_stores",
+  "AutoMergingRetrieverPack": "llama_index.packs.auto_merging_retriever",
+  "ChainOfTablePack": "llama_index.packs.tables",
+  "MixSelfConsistencyPack": "llama_index.packs.tables",
+  "upgrade_dir": "llama_index.cli.new_package",
+  "upgrade_file": "llama_index.cli.new_package",
+  "RagCLI": "llama_index.cli.rag",
+  "default_ragcli_persist_dir": "llama_index.cli.rag",
+  "ContributorClient": "llama_index.networks",
+  "ContributorClientSettings": "llama_index.networks",
+  "ContributorService": "llama_index.networks",
+  "ContributorServiceSettings": "llama_index.networks",
+  "NetworkQueryEngine": "llama_index.networks",
   "BaseParamTuner": "llama_index.experimental.param_tuner",
   "ParamTuner": "llama_index.experimental.param_tuner",
   "AsyncParamTuner": "llama_index.experimental.param_tuner",
@@ -354,8 +367,9 @@
   "SingleStoreVectorStore": "llama_index.vector_stores.singlestoredb",
   "QdrantVectorStore": "llama_index.vector_stores.qdrant",
   "PineconeVectorStore": "llama_index.vector_stores.pinecone",
+  "DuckDBVectorStore": "llama_index.vector_stores.duckdb",
   "SupabaseVectorStore": "llama_index.vector_stores.supabase",
-  "AstraDBVectorStore": "llama_index.vector_stores.astra_db",
+  "UpstashVectorStore": "llama_index.vector_stores.upstash",
   "LanceDBVectorStore": "llama_index.vector_stores.lancedb",
   "ElasticsearchStore": "llama_index.vector_stores.elasticsearch",
   "PGVectorStore": "llama_index.vector_stores.postgres",
@@ -372,9 +386,15 @@
   "DashVectorStore": "llama_index.vector_stores.dashvector",
   "JaguarVectorStore": "llama_index.vector_stores.jaguar",
   "FaissVectorStore": "llama_index.vector_stores.faiss",
+  "AzureAISearchVectorStore": "llama_index.vector_stores.azureaisearch",
+  "CognitiveSearchVectorStore": "llama_index.vector_stores.azureaisearch",
+  "IndexManagement": "llama_index.vector_stores.azureaisearch",
+  "MetadataIndexFieldType": "llama_index.vector_stores.azureaisearch",
   "MongoDBAtlasVectorSearch": "llama_index.vector_stores.mongodb",
+  "AstraDBVectorStore": "llama_index.vector_stores.astra_db",
   "ChromaVectorStore": "llama_index.vector_stores.chroma",
   "BagelVectorStore": "llama_index.vector_stores.bagel",
+  "ClickHouseVectorStore": "llama_index.vector_stores.clickhouse",
   "TxtaiVectorStore": "llama_index.vector_stores.txtai",
   "EpsillaVectorStore": "llama_index.vector_stores.epsilla",
   "LanternVectorStore": "llama_index.vector_stores.lantern",
@@ -383,12 +403,12 @@
   "TypesenseVectorStore": "llama_index.vector_stores.typesense",
   "PGVectoRsStore": "llama_index.vector_stores.pgvecto_rs",
   "OpensearchVectorStore": "llama_index.vector_stores.opensearch",
+  "OpensearchVectorClient": "llama_index.vector_stores.opensearch",
   "DocArrayInMemoryVectorStore": "llama_index.vector_stores.docarray",
   "DocArrayHnswVectorStore": "llama_index.vector_stores.docarray",
   "DynamoDBVectorStore": "llama_index.vector_stores.dynamodb",
   "ChatGPTRetrievalPluginClient": "llama_index.vector_stores.chatgpt_plugin",
   "TairVectorStore": "llama_index.vector_stores.tair",
-  "CognitiveSearchVectorStore": "llama_index.vector_stores.cogsearch",
   "RedisVectorStore": "llama_index.vector_stores.redis",
   "set_google_config": "llama_index.vector_stores.google",
   "GoogleVectorStore": "llama_index.vector_stores.google",
@@ -397,6 +417,8 @@
   "YouRetriever": "llama_index.retrievers.you",
   "ZillizCloudPipelineIndex": "llama_index.indices.managed.zilliz",
   "ZillizCloudPipelineRetriever": "llama_index.indices.managed.zilliz",
+  "LlamaCloudIndex": "llama_index.indices.managed.llama_cloud",
+  "LlamaCloudRetriever": "llama_index.indices.managed.llama_cloud",
   "ColbertIndex": "llama_index.indices.managed.colbert",
   "VectaraIndex": "llama_index.indices.managed.vectara",
   "VectaraRetriever": "llama_index.indices.managed.vectara",
@@ -404,13 +426,12 @@
   "GoogleIndex": "llama_index.indices.managed.google",
   "SalesforceToolSpec": "llama_index.tools.salesforce",
   "PythonFileToolSpec": "llama_index.tools.python_file",
+  "IonicShoppingToolSpec": "llama_index.tools.ionic_shopping",
   "TextToImageToolSpec": "llama_index.tools.text_to_image",
   "OpenAPIToolSpec": "llama_index.tools.openapi",
-  "IonicShoppingToolSpec": "llama_index.tools.ionic_shopping",
   "ShopifyToolSpec": "llama_index.tools.shopify",
   "MetaphorToolSpec": "llama_index.tools.metaphor",
   "ACTION_URL_TMPL": "llama_index.tools.zapier",
-  "ExaToolSpec": "llama_index.tools.exa",
   "ZapierToolSpec": "llama_index.tools.zapier",
   "WikipediaToolSpec": "llama_index.tools.wikipedia",
   "GoogleCalendarToolSpec": "llama_index.tools.google",
@@ -424,12 +445,17 @@
   "ChatGPTPluginToolSpec": "llama_index.tools.chatgpt_plugin",
   "Neo4jQueryToolSpec": "llama_index.tools.neo4j",
   "BingSearchToolSpec": "llama_index.tools.bing_search",
+  "YahooFinanceToolSpec": "llama_index.tools.yahoo_finance",
+  "ExaToolSpec": "llama_index.tools.exa",
+  "DuckDuckGoSearchToolSpec": "llama_index.tools.duckduckgo",
   "CogniswitchToolSpec": "llama_index.tools.cogniswitch",
   "AzureCVToolSpec": "llama_index.tools.azure_cv",
   "CV_URL_TMPL": "llama_index.tools.azure_cv",
   "NotionToolSpec": "llama_index.tools.notion",
   "YelpToolSpec": "llama_index.tools.yelp",
+  "FinanceAgentToolSpec": "llama_index.tools.finance",
   "OpenWeatherMapToolSpec": "llama_index.tools.weather",
+  "BraveSearchToolSpec": "llama_index.tools.brave_search",
   "AzureSpeechToolSpec": "llama_index.tools.azure_speech",
   "WolframAlphaToolSpec": "llama_index.tools.wolfram_alpha",
   "SlackToolSpec": "llama_index.tools.slack",
@@ -450,9 +476,17 @@
   "LLMRailsEmbedding": "llama_index.embeddings.llm_rails",
   "LLMRailsEmbeddings": "llama_index.embeddings.llm_rails",
   "AdapterEmbeddingModel": "llama_index.embeddings.adapter",
+  "LinearAdapterEmbeddingModel": "llama_index.embeddings.adapter",
+  "BaseAdapter": "llama_index.embeddings.adapter",
+  "LinearLayer": "llama_index.embeddings.adapter",
   "TogetherEmbedding": "llama_index.embeddings.together",
   "VoyageEmbedding": "llama_index.embeddings.voyageai",
   "GradientEmbedding": "llama_index.embeddings.gradient",
+  "DashScopeTextEmbeddingType": "llama_index.embeddings.dashscope",
+  "DashScopeTextEmbeddingModels": "llama_index.embeddings.dashscope",
+  "DashScopeBatchTextEmbeddingModels": "llama_index.embeddings.dashscope",
+  "DashScopeEmbedding": "llama_index.embeddings.dashscope",
+  "DashScopeMultiModalEmbeddingModels": "llama_index.embeddings.dashscope",
   "HuggingFaceEmbedding": "llama_index.embeddings.huggingface",
   "HuggingFaceInferenceAPIEmbedding": "llama_index.embeddings.huggingface",
   "HuggingFaceInferenceAPIEmbeddings": "llama_index.embeddings.huggingface",
@@ -463,10 +497,12 @@
   "OpenAIEmbeddingModelType": "llama_index.embeddings.openai",
   "OpenAIEmbeddingModeModel": "llama_index.embeddings.openai",
   "CohereEmbedding": "llama_index.embeddings.cohere",
+  "IntelEmbedding": "llama_index.embeddings.huggingface_optimum_intel",
   "JinaEmbedding": "llama_index.embeddings.jinaai",
   "NomicEmbedding": "llama_index.embeddings.nomic",
   "GeminiEmbedding": "llama_index.embeddings.gemini",
   "FastEmbedEmbedding": "llama_index.embeddings.fastembed",
+  "FireworksEmbedding": "llama_index.embeddings.fireworks",
   "InstructorEmbedding": "llama_index.embeddings.instructor",
   "OptimumEmbedding": "llama_index.embeddings.huggingface_optimum",
   "LangchainEmbedding": "llama_index.embeddings.langchain",
@@ -474,31 +510,46 @@
   "GoogleUnivSentEncoderEmbedding": "llama_index.embeddings.google",
   "MistralAIEmbedding": "llama_index.embeddings.mistralai",
   "BedrockEmbedding": "llama_index.embeddings.bedrock",
+  "Models": "llama_index.embeddings.bedrock",
   "ClarifaiEmbedding": "llama_index.embeddings.clarifai",
   "ElasticsearchEmbedding": "llama_index.embeddings.elasticsearch",
   "AzureOpenAIEmbedding": "llama_index.embeddings.azure_openai",
+  "AzureOpenAI": "llama_index.embeddings.azure_openai",
+  "AsyncAzureOpenAI": "llama_index.embeddings.azure_openai",
   "TextEmbeddingsInference": "llama_index.embeddings.text_embeddings_inference",
+  "UpTrainCallbackHandler": "llama_index.callbacks.uptrain",
+  "deepeval_callback_handler": "llama_index.callbacks.deepeval",
+  "OpenInferenceCallbackHandler": "llama_index.callbacks.openinference",
+  "WandbCallbackHandler": "llama_index.callbacks.wandb",
+  "argilla_callback_handler": "llama_index.callbacks.argilla",
+  "honeyhive_callback_handler": "llama_index.callbacks.honeyhive",
+  "arize_phoenix_callback_handler": "llama_index.callbacks.arize_phoenix",
+  "AimCallback": "llama_index.callbacks.aim",
+  "PromptLayerHandler": "llama_index.callbacks.promptlayer",
+  "JinaRerank": "llama_index.postprocessor.jinaai_rerank",
+  "ColbertRerank": "llama_index.postprocessor.colbert_rerank",
   "LongLLMLinguaPostprocessor": "llama_index.postprocessor.longllmlingua",
   "RankGPTRerank": "llama_index.postprocessor.rankgpt_rerank",
   "CohereRerank": "llama_index.postprocessor.cohere_rerank",
+  "PresidioPIINodePostprocessor": "llama_index.postprocessor.presidio",
   "FlagEmbeddingReranker": "llama_index.postprocessor.flag_embedding_reranker",
   "Neo4jGraphStore": "llama_index.graph_stores.neo4j",
   "FalkorDBGraphStore": "llama_index.graph_stores.falkordb",
   "KuzuGraphStore": "llama_index.graph_stores.kuzu",
   "NebulaGraphStore": "llama_index.graph_stores.nebula",
   "OpenAIMultiModal": "llama_index.multi_modal_llms.openai",
+  "OllamaMultiModal": "llama_index.multi_modal_llms.ollama",
   "AzureOpenAIMultiModal": "llama_index.multi_modal_llms.azure_openai",
   "ReplicateMultiModal": "llama_index.multi_modal_llms.replicate",
   "GeminiMultiModal": "llama_index.multi_modal_llms.gemini",
-  "OllamaMultiModal": "llama_index.multi_modal_llms.ollama",
   "DashScopeMultiModal": "llama_index.multi_modal_llms.dashscope",
   "DashScopeMultiModalModels": "llama_index.multi_modal_llms.dashscope",
   "OpenAIAgent": "llama_index.agent.openai",
   "OpenAIAgentWorker": "llama_index.agent.openai",
   "OpenAIAssistantAgent": "llama_index.agent.openai",
+  "ContextRetrieverOpenAIAgent": "llama_index.agent.openai_legacy",
   "BaseOpenAIAgent": "llama_index.agent.openai_legacy",
   "FnRetrieverOpenAIAgent": "llama_index.agent.openai_legacy",
-  "ContextRetrieverOpenAIAgent": "llama_index.agent.openai_legacy",
   "PostgresKVStore": "llama_index.storage.kvstore.postgres",
   "RedisKVStore": "llama_index.storage.kvstore.redis",
   "FirestoreKVStore": "llama_index.storage.kvstore.firestore",
@@ -531,10 +582,9 @@
   "AugmentationPrecisionEvaluator": "llama_index.evaluation.tonic_validate",
   "RetrievalPrecisionEvaluator": "llama_index.evaluation.tonic_validate",
   "TonicValidateEvaluator": "llama_index.evaluation.tonic_validate",
-  "BaseReader": "llama_index.core.readers.base",
+  "LlamaParse": "llama_index.readers.llama_parse",
   "DocugamiReader": "llama_index.readers.docugami",
   "SlackReader": "llama_index.readers.slack",
-  "GeniusReader": "llama_index.readers.genius",
   "YoutubeTranscriptReader": "llama_index.readers.youtube_transcript",
   "MboxReader": "llama_index.readers.mbox",
   "StackoverflowReader": "llama_index.readers.stackoverflow",
@@ -543,7 +593,6 @@
   "DiscordReader": "llama_index.readers.discord",
   "EarningsCallTranscript": "llama_index.readers.earnings_call_transcript",
   "SimpleCouchDBReader": "llama_index.readers.couchdb",
-  "CouchbaseReader": "llama_index.readers.couchbase",
   "SingleStoreReader": "llama_index.readers.singlestore",
   "JSONReader": "llama_index.readers.json",
   "TrelloReader": "llama_index.readers.trello",
@@ -564,9 +613,9 @@
   "OpendalS3Reader": "llama_index.readers.opendal",
   "AzStorageBlobReader": "llama_index.readers.azstorage_blob",
   "ReadwiseReader": "llama_index.readers.readwise",
+  "GeniusReader": "llama_index.readers.genius",
   "ApifyActor": "llama_index.readers.apify",
   "ApifyDataset": "llama_index.readers.apify",
-  "SimpleArangoDBReader": "llama_index.readers.arango_db",
   "AthenaReader": "llama_index.readers.athena",
   "DatabaseReader": "llama_index.readers.database",
   "RemoteReader": "llama_index.readers.remote",
@@ -578,6 +627,7 @@
   "MilvusReader": "llama_index.readers.milvus",
   "PDFNougatOCR": "llama_index.readers.nougat_ocr",
   "AssemblyAIAudioTranscriptReader": "llama_index.readers.assemblyai",
+  "TranscriptFormat": "llama_index.readers.assemblyai",
   "GraphDBCypherReader": "llama_index.readers.graphdb_cypher",
   "ConfluenceReader": "llama_index.readers.confluence",
   "LilacReader": "llama_index.readers.lilac",
@@ -590,8 +640,6 @@
   "SimpleMongoReader": "llama_index.readers.mongodb",
   "NotionPageReader": "llama_index.readers.notion",
   "WordpressReader": "llama_index.readers.wordpress",
-  "XMLReader": "llama_index.readers.file",
-  "PagedCSVReader": "llama_index.readers.file",
   "AirbyteTypeformReader": "llama_index.readers.airbyte_typeform",
   "AirbyteZendeskSupportReader": "llama_index.readers.airbyte_zendesk_support",
   "FirestoreReader": "llama_index.readers.firestore",
@@ -609,6 +657,7 @@
   "FirebaseRealtimeDatabaseReader": "llama_index.readers.firebase_realtimedb",
   "RemoteDepthReader": "llama_index.readers.remote_depth",
   "MakeWrapper": "llama_index.readers.make_com",
+  "SimpleArangoDBReader": "llama_index.readers.arango_db",
   "MangaDexReader": "llama_index.readers.mangadex",
   "IntercomReader": "llama_index.readers.intercom",
   "AirbyteGongReader": "llama_index.readers.airbyte_gong",
@@ -640,6 +689,7 @@
   "GmailReader": "llama_index.readers.google",
   "GoogleKeepReader": "llama_index.readers.google",
   "FeishuDocsReader": "llama_index.readers.feishu_docs",
+  "CouchbaseReader": "llama_index.readers.couchbase",
   "OpenAlexReader": "llama_index.readers.openalex",
   "TxtaiReader": "llama_index.readers.txtai",
   "AzCognitiveSearchReader": "llama_index.readers.azcognitive_search",
@@ -665,8 +715,10 @@
   "HubspotReader": "llama_index.readers.hubspot",
   "DocxReader": "llama_index.readers.file",
   "HWPReader": "llama_index.readers.file",
+  "PDFReader": "llama_index.readers.file",
   "EpubReader": "llama_index.readers.file",
   "FlatReader": "llama_index.readers.file",
+  "HTMLTagReader": "llama_index.readers.file",
   "ImageCaptionReader": "llama_index.readers.file",
   "ImageReader": "llama_index.readers.file",
   "ImageVisionLLMReader": "llama_index.readers.file",
@@ -678,7 +730,9 @@
   "UnstructuredReader": "llama_index.readers.file",
   "PyMuPDFReader": "llama_index.readers.file",
   "ImageTabularChartReader": "llama_index.readers.file",
-  "CSVReader": "llama_index.readers.file.tabular",
+  "XMLReader": "llama_index.readers.file",
+  "PagedCSVReader": "llama_index.readers.file",
+  "CSVReader": "llama_index.readers.file",
   "KalturaESearchReader": "llama_index.readers.kaltura_esearch",
   "AwadbReader": "llama_index.readers.awadb",
   "IMDBReviews": "llama_index.readers.imdb_review",
@@ -706,26 +760,31 @@
   "ChromaReader": "llama_index.readers.chroma",
   "WeatherReader": "llama_index.readers.weather",
   "ChatGPTRetrievalPluginReader": "llama_index.readers.chatgpt_plugin",
+  "ClickHouseReader": "llama_index.readers.clickhouse",
   "MetalReader": "llama_index.readers.metal",
   "BoardDocsReader": "llama_index.readers.boarddocs",
   "GuidanceQuestionGenerator": "llama_index.question_gen.guidance",
   "OpenAIQuestionGenerator": "llama_index.question_gen.openai",
   "PaLM": "llama_index.llms.palm",
-  "DashScope": "llama_index.llms.dashscope",
-  "DashScopeGenerationModels": "llama_index.llms.dashscope",
   "WatsonX": "llama_index.llms.watsonx",
   "Cohere": "llama_index.llms.cohere",
   "NvidiaTriton": "llama_index.llms.nvidia_triton",
   "AI21": "llama_index.llms.ai21",
   "Bedrock": "llama_index.llms.bedrock",
+  "completion_with_retry": "llama_index.llms.bedrock",
+  "completion_response_to_chat_response": "llama_index.llms.bedrock",
   "HuggingFaceLLM": "llama_index.llms.huggingface",
   "HuggingFaceInferenceAPI": "llama_index.llms.huggingface",
-  "AzureOpenAI": "llama_index.llms.azure_openai",
+  "SyncAzureOpenAI": "llama_index.llms.azure_openai",
+  "DashScope": "llama_index.llms.dashscope",
+  "DashScopeGenerationModels": "llama_index.llms.dashscope",
   "LocalTensorRTLLM": "llama_index.llms.nvidia_tensorrt",
   "Anthropic": "llama_index.llms.anthropic",
   "Gemini": "llama_index.llms.gemini",
+  "Friendli": "llama_index.llms.friendli",
   "Clarifai": "llama_index.llms.clarifai",
   "LlamaAPI": "llama_index.llms.llama_api",
+  "MyMagicAI": "llama_index.llms.mymagic",
   "LlamaCPP": "llama_index.llms.llama_cpp",
   "Perplexity": "llama_index.llms.perplexity",
   "RunGptLLM": "llama_index.llms.rungpt",
@@ -738,10 +797,14 @@
   "SageMakerLLM": "llama_index.llms.sagemaker_endpoint",
   "Portkey": "llama_index.llms.portkey",
   "Vllm": "llama_index.llms.vllm",
+  "VllmServer": "llama_index.llms.vllm",
+  "Maritalk": "llama_index.llms.maritalk",
+  "Groq": "llama_index.llms.groq",
   "Neutrino": "llama_index.llms.neutrino",
   "MonsterLLM": "llama_index.llms.monsterapi",
   "PredibaseLLM": "llama_index.llms.predibase",
   "Xinference": "llama_index.llms.xinference",
+  "Fireworks": "llama_index.llms.fireworks",
   "MistralAI": "llama_index.llms.mistralai",
   "Anyscale": "llama_index.llms.anyscale",
   "Vertex": "llama_index.llms.vertex",
@@ -753,17 +816,17 @@
   "OpenRouter": "llama_index.llms.openrouter",
   "OpenAI": "llama_index.llms.openai",
   "Tokenizer": "llama_index.llms.openai",
+  "SyncOpenAI": "llama_index.llms.openai",
+  "AsyncOpenAI": "llama_index.llms.openai",
   "GradientBaseModelLLM": "llama_index.llms.gradient",
   "GradientModelAdapterLLM": "llama_index.llms.gradient",
-  "Friendli": "llama_index.llms.friendli",
   "EntityExtractor": "llama_index.extractors.entity",
   "MarvinMetadataExtractor": "llama_index.extractors.marvin",
   "WeaviateRetryEnginePack": "llama_index.packs.retry_engine_weaviate",
   "LlavaCompletionPack": "llama_index.packs.llava_completion",
-  "VannaPack": "llama_index.packs.vanna",
-  "VannaQueryEngine": "llama_index.packs.vanna",
   "ZephyrQueryEnginePack": "llama_index.packs.zephyr_query_engine",
   "TimescaleVectorAutoretrievalPack": "llama_index.packs.timescale_vector_autoretrieval",
+  "CorrectiveRAGPack": "llama_index.packs.corrective_rag",
   "MultiDocumentAgentsPack": "llama_index.packs.multi_document_agents",
   "MultiDocAutoRetrieverPack": "llama_index.packs.multidoc_autoretrieval",
   "GmailOpenAIAgentPack": "llama_index.packs.gmail_openai_agent",
@@ -774,33 +837,37 @@
   "TruLensHarmlessPack": "llama_index.packs.trulens_eval_packs",
   "TruLensHelpfulPack": "llama_index.packs.trulens_eval_packs",
   "EvaluatorBenchmarkerPack": "llama_index.packs.evaluator_benchmarker",
+  "VannaPack": "llama_index.packs.vanna",
+  "VannaQueryEngine": "llama_index.packs.vanna",
   "RAGFusionPipelinePack": "llama_index.packs.rag_fusion_query_pipeline",
   "LlamaGuardModeratorPack": "llama_index.packs.llama_guard_moderator",
   "SnowflakeQueryEnginePack": "llama_index.packs.snowflake_query_engine",
+  "SelfRAGPack": "llama_index.packs.self_rag",
+  "SelfRAGQueryEngine": "llama_index.packs.self_rag",
+  "SelfDiscoverPack": "llama_index.packs.self_discover",
   "LlamaDatasetMetadataPack": "llama_index.packs.llama_dataset_metadata",
   "StockMarketDataQueryEnginePack": "llama_index.packs.stock_market_data_query_engine",
   "RagEvaluatorPack": "llama_index.packs.rag_evaluator",
   "ArizePhoenixQueryEnginePack": "llama_index.packs.arize_phoenix_query_engine",
   "PanelChatPack": "llama_index.packs.panel_chatbot",
+  "LocalRAGCLIPack": "llama_index.packs.rag_cli_local",
   "MultiTenancyRAGPack": "llama_index.packs.multi_tenancy_rag",
   "StreamlitChatPack": "llama_index.packs.streamlit_chatbot",
   "VectaraRagPack": "llama_index.packs.vectara_rag",
-  "ChainOfTablePack": "llama_index.packs.tables",
-  "MixSelfConsistencyPack": "llama_index.packs.tables",
-  "SelfRAGPack": "llama_index.packs.self_rag",
-  "SelfRAGQueryEngine": "llama_index.packs.self_rag",
   "SemanticChunkingQueryEnginePack": "llama_index.packs.node_parser_semantic_chunking",
   "RedisIngestionPipelinePack": "llama_index.packs.redis_ingestion_pipeline",
   "DenseXRetrievalPack": "llama_index.packs.dense_x_retrieval",
-  "LocalRAGCLIPack": "llama_index.packs.rag_cli_local",
-  "InferRetrieveRerankPack": "llama_index.packs.infer_retrieve_rerank",
-  "AutoMergingRetrieverPack": "llama_index.packs.auto_merging_retriever",
   "LLMCompilerAgentPack": "llama_index.packs.agents_llm_compiler",
   "GradioReActAgentPack": "llama_index.packs.gradio_react_agent_chatbot",
   "WeaviateSubQuestionPack": "llama_index.packs.sub_question_weaviate",
   "DeepMemoryRetrieverPack": "llama_index.packs.deeplake_deepmemory_retriever",
   "NebulaGraphQueryEnginePack": "llama_index.packs.nebulagraph_query_engine",
   "VoyageQueryEnginePack": "llama_index.packs.voyage_query_engine",
+  "InferRetrieveRerankPack": "llama_index.packs.infer_retrieve_rerank",
+  "KodaRetriever": "llama_index.packs.koda_retriever",
+  "AlphaMatrix": "llama_index.packs.koda_retriever",
+  "DEFAULT_CATEGORIES": "llama_index.packs.koda_retriever",
+  "SubDocSummaryPack": "llama_index.packs.subdoc_summary",
   "SentenceWindowRetrieverPack": "llama_index.packs.sentence_window_retriever",
   "EmbeddedTablesUnstructuredRetrieverPack": "llama_index.packs.recursive_retriever",
   "RecursiveRetrieverSmallToBigPack": "llama_index.packs.recursive_retriever",
@@ -825,9 +892,5 @@
   "get_eval_results": "llama_index.core.evaluation.eval_utils",
   "VectorStoreInfo": "llama_index.core.vector_stores",
   "MetadataInfo": "llama_index.core.vector_stores",
-  "UpstashVectorStore": "llama_index.vector_stores.upstash",
-  "AzureAISearchVectorStore": "llama_index.vector_stores.azureaisearch",
-  "CognitiveSearchVectorStore": "llama_index.vector_stores.azureaisearch",
-  "IndexManagement": "llama_index.vector_stores.azureaisearch",
   "REPLICATE_MULTI_MODAL_LLM_MODELS": "llama_index.multi_modal_llms.replicate.base"
 }
diff --git a/llama-index-cli/pyproject.toml b/llama-index-cli/pyproject.toml
index 5df7321e5c072d7f66522a2dce170fcc56f7901b..0c68a47316e16b98e270a6deeb37d5eddb4c4d06 100644
--- a/llama-index-cli/pyproject.toml
+++ b/llama-index-cli/pyproject.toml
@@ -32,7 +32,7 @@ maintainers = [
 name = "llama-index-cli"
 packages = [{include = "llama_index/"}]
 readme = "README.md"
-version = "0.1.5"
+version = "0.1.6"
 
 [tool.poetry.dependencies]
 python = ">=3.8.1,<4.0"
diff --git a/llama-index-core/llama_index/core/command_line/mappings.json b/llama-index-core/llama_index/core/command_line/mappings.json
index a1ee4aec6fdffadf8a92219d049effee9fa643af..86b7b3ae5417fc08fbe40e145aa430d82b8bbf6e 100644
--- a/llama-index-core/llama_index/core/command_line/mappings.json
+++ b/llama-index-core/llama_index/core/command_line/mappings.json
@@ -53,6 +53,7 @@
   "set_global_handler": "llama_index.core",
   "set_global_tokenizer": "llama_index.core",
   "get_tokenizer": "llama_index.core",
+  "Settings": "llama_index.core",
   "AgentRunner": "llama_index.core.agent",
   "ParallelAgentRunner": "llama_index.core.agent",
   "ReActAgentWorker": "llama_index.core.agent",
@@ -70,14 +71,6 @@
   "LlamaDebugHandler": "llama_index.core.callbacks",
   "TokenCountingHandler": "llama_index.core.callbacks",
   "trace_method": "llama_index.core.callbacks",
-  "deepeval_callback_handler": "llama_index.callbacks.deepeval",
-  "OpenInferenceCallbackHandler": "llama_index.callbacks.openinference",
-  "WandbCallbackHandler": "llama_index.callbacks.wandb",
-  "argilla_callback_handler": "llama_index.callbacks.argilla",
-  "honeyhive_callback_handler": "llama_index.callbacks.honeyhive",
-  "arize_phoenix_callback_handler": "llama_index.callbacks.arize_phoenix",
-  "AimCallback": "llama_index.callbacks.aim",
-  "PromptLayerHandler": "llama_index.callbacks.promptlayer",
   "SimpleChatEngine": "llama_index.core.chat_engine",
   "CondenseQuestionChatEngine": "llama_index.core.chat_engine",
   "ContextChatEngine": "llama_index.core.chat_engine",
@@ -92,6 +85,7 @@
   "BaseEmbedding": "llama_index.core.embeddings",
   "MultiModalEmbedding": "llama_index.core.embeddings",
   "Pooling": "llama_index.core.embeddings",
+  "resolve_embed_model": "llama_index.core.embeddings",
   "BaseEvaluator": "llama_index.core.evaluation",
   "AnswerRelevancyEvaluator": "llama_index.core.evaluation",
   "ContextRelevancyEvaluator": "llama_index.core.evaluation",
@@ -128,7 +122,7 @@
   "BaseExtractor": "llama_index.core.extractors",
   "PydanticProgramExtractor": "llama_index.core.extractors",
   "SimpleGraphStore": "llama_index.core.graph_stores",
-  "SummaryIndex": "llama_index.core",
+  "SummaryIndex": "llama_index.core.indices",
   "PandasIndex": "llama_index.core.indices",
   "SQLStructStoreIndex": "llama_index.core.indices",
   "MultiModalVectorStoreIndex": "llama_index.core.indices",
@@ -181,6 +175,7 @@
   "CompletionResponseGen": "llama_index.core.llms",
   "LLMMetadata": "llama_index.core.llms",
   "MessageRole": "llama_index.core.llms",
+  "MockLLM": "llama_index.core.llms",
   "BaseMemory": "llama_index.core.memory",
   "ChatMemoryBuffer": "llama_index.core.memory",
   "MultiModalLLMMetadata": "llama_index.core.multi_modal_llms",
@@ -203,6 +198,8 @@
   "UnstructuredElementNodeParser": "llama_index.core.node_parser",
   "get_leaf_nodes": "llama_index.core.node_parser",
   "get_root_nodes": "llama_index.core.node_parser",
+  "get_child_nodes": "llama_index.core.node_parser",
+  "get_deeper_nodes": "llama_index.core.node_parser",
   "# deprecated": "llama_index.core.node_parser",
   "for backwards compatibilitySimpleNodeParser": "llama_index.core.node_parser",
   "ObjectRetriever": "llama_index.core.objects",
@@ -269,15 +266,19 @@
   "AgentInputComponent": "llama_index.core.query_pipeline",
   "ArgPackComponent": "llama_index.core.query_pipeline",
   "FnComponent": "llama_index.core.query_pipeline",
+  "FunctionComponent": "llama_index.core.query_pipeline",
   "InputComponent": "llama_index.core.query_pipeline",
   "RouterComponent": "llama_index.core.query_pipeline",
   "ToolRunnerComponent": "llama_index.core.query_pipeline",
   "QueryPipeline": "llama_index.core.query_pipeline",
+  "CustomAgentComponent": "llama_index.core.query_pipeline",
+  "QueryComponent": "llama_index.core.query_pipeline",
+  "Link": "llama_index.core.query_pipeline",
+  "ChainableMixin": "llama_index.core.query_pipeline",
+  "CustomQueryComponent": "llama_index.core.query_pipeline",
   "LLMQuestionGenerator": "llama_index.core.question_gen",
   "SubQuestionOutputParser": "llama_index.core.question_gen",
   "ReaderConfig": "llama_index.core.readers",
-  "PDFReader": "llama_index.readers.file",
-  "HTMLTagReader": "llama_index.readers.file",
   "StringIterableReader": "llama_index.core.readers",
   "ResponseMode": "llama_index.core.response_synthesizers",
   "BaseSynthesizer": "llama_index.core.response_synthesizers",
@@ -305,6 +306,7 @@
   "RecursiveRetriever": "llama_index.core.retrievers",
   "AutoMergingRetriever": "llama_index.core.retrievers",
   "RouterRetriever": "llama_index.core.retrievers",
+  "BM25Retriever": "llama_index.core.retrievers",
   "QueryFusionRetriever": "llama_index.core.retrievers",
   "# SQLSQLRetriever": "llama_index.core.retrievers",
   "NLSQLRetriever": "llama_index.core.retrievers",
@@ -335,6 +337,18 @@
   "FilterCondition": "llama_index.core.vector_stores",
   "FilterOperator": "llama_index.core.vector_stores",
   "SimpleVectorStore": "llama_index.core.vector_stores",
+  "AutoMergingRetrieverPack": "llama_index.packs.auto_merging_retriever",
+  "ChainOfTablePack": "llama_index.packs.tables",
+  "MixSelfConsistencyPack": "llama_index.packs.tables",
+  "upgrade_dir": "llama_index.cli.new_package",
+  "upgrade_file": "llama_index.cli.new_package",
+  "RagCLI": "llama_index.cli.rag",
+  "default_ragcli_persist_dir": "llama_index.cli.rag",
+  "ContributorClient": "llama_index.networks",
+  "ContributorClientSettings": "llama_index.networks",
+  "ContributorService": "llama_index.networks",
+  "ContributorServiceSettings": "llama_index.networks",
+  "NetworkQueryEngine": "llama_index.networks",
   "BaseParamTuner": "llama_index.experimental.param_tuner",
   "ParamTuner": "llama_index.experimental.param_tuner",
   "AsyncParamTuner": "llama_index.experimental.param_tuner",
@@ -353,8 +367,9 @@
   "SingleStoreVectorStore": "llama_index.vector_stores.singlestoredb",
   "QdrantVectorStore": "llama_index.vector_stores.qdrant",
   "PineconeVectorStore": "llama_index.vector_stores.pinecone",
+  "DuckDBVectorStore": "llama_index.vector_stores.duckdb",
   "SupabaseVectorStore": "llama_index.vector_stores.supabase",
-  "AstraDBVectorStore": "llama_index.vector_stores.astra_db",
+  "UpstashVectorStore": "llama_index.vector_stores.upstash",
   "LanceDBVectorStore": "llama_index.vector_stores.lancedb",
   "ElasticsearchStore": "llama_index.vector_stores.elasticsearch",
   "PGVectorStore": "llama_index.vector_stores.postgres",
@@ -371,9 +386,15 @@
   "DashVectorStore": "llama_index.vector_stores.dashvector",
   "JaguarVectorStore": "llama_index.vector_stores.jaguar",
   "FaissVectorStore": "llama_index.vector_stores.faiss",
+  "AzureAISearchVectorStore": "llama_index.vector_stores.azureaisearch",
+  "CognitiveSearchVectorStore": "llama_index.vector_stores.azureaisearch",
+  "IndexManagement": "llama_index.vector_stores.azureaisearch",
+  "MetadataIndexFieldType": "llama_index.vector_stores.azureaisearch",
   "MongoDBAtlasVectorSearch": "llama_index.vector_stores.mongodb",
+  "AstraDBVectorStore": "llama_index.vector_stores.astra_db",
   "ChromaVectorStore": "llama_index.vector_stores.chroma",
   "BagelVectorStore": "llama_index.vector_stores.bagel",
+  "ClickHouseVectorStore": "llama_index.vector_stores.clickhouse",
   "TxtaiVectorStore": "llama_index.vector_stores.txtai",
   "EpsillaVectorStore": "llama_index.vector_stores.epsilla",
   "LanternVectorStore": "llama_index.vector_stores.lantern",
@@ -382,21 +403,22 @@
   "TypesenseVectorStore": "llama_index.vector_stores.typesense",
   "PGVectoRsStore": "llama_index.vector_stores.pgvecto_rs",
   "OpensearchVectorStore": "llama_index.vector_stores.opensearch",
+  "OpensearchVectorClient": "llama_index.vector_stores.opensearch",
   "DocArrayInMemoryVectorStore": "llama_index.vector_stores.docarray",
   "DocArrayHnswVectorStore": "llama_index.vector_stores.docarray",
   "DynamoDBVectorStore": "llama_index.vector_stores.dynamodb",
   "ChatGPTRetrievalPluginClient": "llama_index.vector_stores.chatgpt_plugin",
   "TairVectorStore": "llama_index.vector_stores.tair",
-  "CognitiveSearchVectorStore": "llama_index.vector_stores.cogsearch",
   "RedisVectorStore": "llama_index.vector_stores.redis",
   "set_google_config": "llama_index.vector_stores.google",
   "GoogleVectorStore": "llama_index.vector_stores.google",
   "MetalVectorStore": "llama_index.vector_stores.metal",
-  "BM25Retriever": "llama_index.retrievers.bm25",
   "PathwayRetriever": "llama_index.retrievers.pathway",
   "YouRetriever": "llama_index.retrievers.you",
   "ZillizCloudPipelineIndex": "llama_index.indices.managed.zilliz",
   "ZillizCloudPipelineRetriever": "llama_index.indices.managed.zilliz",
+  "LlamaCloudIndex": "llama_index.indices.managed.llama_cloud",
+  "LlamaCloudRetriever": "llama_index.indices.managed.llama_cloud",
   "ColbertIndex": "llama_index.indices.managed.colbert",
   "VectaraIndex": "llama_index.indices.managed.vectara",
   "VectaraRetriever": "llama_index.indices.managed.vectara",
@@ -404,13 +426,12 @@
   "GoogleIndex": "llama_index.indices.managed.google",
   "SalesforceToolSpec": "llama_index.tools.salesforce",
   "PythonFileToolSpec": "llama_index.tools.python_file",
+  "IonicShoppingToolSpec": "llama_index.tools.ionic_shopping",
   "TextToImageToolSpec": "llama_index.tools.text_to_image",
   "OpenAPIToolSpec": "llama_index.tools.openapi",
-  "IonicShoppingToolSpec": "llama_index.tools.ionic_shopping",
   "ShopifyToolSpec": "llama_index.tools.shopify",
   "MetaphorToolSpec": "llama_index.tools.metaphor",
   "ACTION_URL_TMPL": "llama_index.tools.zapier",
-  "ExaToolSpec": "llama_index.tools.exa",
   "ZapierToolSpec": "llama_index.tools.zapier",
   "WikipediaToolSpec": "llama_index.tools.wikipedia",
   "GoogleCalendarToolSpec": "llama_index.tools.google",
@@ -424,12 +445,17 @@
   "ChatGPTPluginToolSpec": "llama_index.tools.chatgpt_plugin",
   "Neo4jQueryToolSpec": "llama_index.tools.neo4j",
   "BingSearchToolSpec": "llama_index.tools.bing_search",
+  "YahooFinanceToolSpec": "llama_index.tools.yahoo_finance",
+  "ExaToolSpec": "llama_index.tools.exa",
+  "DuckDuckGoSearchToolSpec": "llama_index.tools.duckduckgo",
   "CogniswitchToolSpec": "llama_index.tools.cogniswitch",
   "AzureCVToolSpec": "llama_index.tools.azure_cv",
   "CV_URL_TMPL": "llama_index.tools.azure_cv",
   "NotionToolSpec": "llama_index.tools.notion",
   "YelpToolSpec": "llama_index.tools.yelp",
+  "FinanceAgentToolSpec": "llama_index.tools.finance",
   "OpenWeatherMapToolSpec": "llama_index.tools.weather",
+  "BraveSearchToolSpec": "llama_index.tools.brave_search",
   "AzureSpeechToolSpec": "llama_index.tools.azure_speech",
   "WolframAlphaToolSpec": "llama_index.tools.wolfram_alpha",
   "SlackToolSpec": "llama_index.tools.slack",
@@ -450,9 +476,17 @@
   "LLMRailsEmbedding": "llama_index.embeddings.llm_rails",
   "LLMRailsEmbeddings": "llama_index.embeddings.llm_rails",
   "AdapterEmbeddingModel": "llama_index.embeddings.adapter",
+  "LinearAdapterEmbeddingModel": "llama_index.embeddings.adapter",
+  "BaseAdapter": "llama_index.embeddings.adapter",
+  "LinearLayer": "llama_index.embeddings.adapter",
   "TogetherEmbedding": "llama_index.embeddings.together",
   "VoyageEmbedding": "llama_index.embeddings.voyageai",
   "GradientEmbedding": "llama_index.embeddings.gradient",
+  "DashScopeTextEmbeddingType": "llama_index.embeddings.dashscope",
+  "DashScopeTextEmbeddingModels": "llama_index.embeddings.dashscope",
+  "DashScopeBatchTextEmbeddingModels": "llama_index.embeddings.dashscope",
+  "DashScopeEmbedding": "llama_index.embeddings.dashscope",
+  "DashScopeMultiModalEmbeddingModels": "llama_index.embeddings.dashscope",
   "HuggingFaceEmbedding": "llama_index.embeddings.huggingface",
   "HuggingFaceInferenceAPIEmbedding": "llama_index.embeddings.huggingface",
   "HuggingFaceInferenceAPIEmbeddings": "llama_index.embeddings.huggingface",
@@ -463,10 +497,12 @@
   "OpenAIEmbeddingModelType": "llama_index.embeddings.openai",
   "OpenAIEmbeddingModeModel": "llama_index.embeddings.openai",
   "CohereEmbedding": "llama_index.embeddings.cohere",
+  "IntelEmbedding": "llama_index.embeddings.huggingface_optimum_intel",
   "JinaEmbedding": "llama_index.embeddings.jinaai",
   "NomicEmbedding": "llama_index.embeddings.nomic",
   "GeminiEmbedding": "llama_index.embeddings.gemini",
   "FastEmbedEmbedding": "llama_index.embeddings.fastembed",
+  "FireworksEmbedding": "llama_index.embeddings.fireworks",
   "InstructorEmbedding": "llama_index.embeddings.instructor",
   "OptimumEmbedding": "llama_index.embeddings.huggingface_optimum",
   "LangchainEmbedding": "llama_index.embeddings.langchain",
@@ -474,31 +510,46 @@
   "GoogleUnivSentEncoderEmbedding": "llama_index.embeddings.google",
   "MistralAIEmbedding": "llama_index.embeddings.mistralai",
   "BedrockEmbedding": "llama_index.embeddings.bedrock",
+  "Models": "llama_index.embeddings.bedrock",
   "ClarifaiEmbedding": "llama_index.embeddings.clarifai",
   "ElasticsearchEmbedding": "llama_index.embeddings.elasticsearch",
   "AzureOpenAIEmbedding": "llama_index.embeddings.azure_openai",
+  "AzureOpenAI": "llama_index.embeddings.azure_openai",
+  "AsyncAzureOpenAI": "llama_index.embeddings.azure_openai",
   "TextEmbeddingsInference": "llama_index.embeddings.text_embeddings_inference",
+  "UpTrainCallbackHandler": "llama_index.callbacks.uptrain",
+  "deepeval_callback_handler": "llama_index.callbacks.deepeval",
+  "OpenInferenceCallbackHandler": "llama_index.callbacks.openinference",
+  "WandbCallbackHandler": "llama_index.callbacks.wandb",
+  "argilla_callback_handler": "llama_index.callbacks.argilla",
+  "honeyhive_callback_handler": "llama_index.callbacks.honeyhive",
+  "arize_phoenix_callback_handler": "llama_index.callbacks.arize_phoenix",
+  "AimCallback": "llama_index.callbacks.aim",
+  "PromptLayerHandler": "llama_index.callbacks.promptlayer",
+  "JinaRerank": "llama_index.postprocessor.jinaai_rerank",
+  "ColbertRerank": "llama_index.postprocessor.colbert_rerank",
   "LongLLMLinguaPostprocessor": "llama_index.postprocessor.longllmlingua",
   "RankGPTRerank": "llama_index.postprocessor.rankgpt_rerank",
   "CohereRerank": "llama_index.postprocessor.cohere_rerank",
+  "PresidioPIINodePostprocessor": "llama_index.postprocessor.presidio",
   "FlagEmbeddingReranker": "llama_index.postprocessor.flag_embedding_reranker",
   "Neo4jGraphStore": "llama_index.graph_stores.neo4j",
   "FalkorDBGraphStore": "llama_index.graph_stores.falkordb",
   "KuzuGraphStore": "llama_index.graph_stores.kuzu",
   "NebulaGraphStore": "llama_index.graph_stores.nebula",
   "OpenAIMultiModal": "llama_index.multi_modal_llms.openai",
+  "OllamaMultiModal": "llama_index.multi_modal_llms.ollama",
   "AzureOpenAIMultiModal": "llama_index.multi_modal_llms.azure_openai",
   "ReplicateMultiModal": "llama_index.multi_modal_llms.replicate",
   "GeminiMultiModal": "llama_index.multi_modal_llms.gemini",
-  "OllamaMultiModal": "llama_index.multi_modal_llms.ollama",
   "DashScopeMultiModal": "llama_index.multi_modal_llms.dashscope",
   "DashScopeMultiModalModels": "llama_index.multi_modal_llms.dashscope",
   "OpenAIAgent": "llama_index.agent.openai",
   "OpenAIAgentWorker": "llama_index.agent.openai",
   "OpenAIAssistantAgent": "llama_index.agent.openai",
+  "ContextRetrieverOpenAIAgent": "llama_index.agent.openai_legacy",
   "BaseOpenAIAgent": "llama_index.agent.openai_legacy",
   "FnRetrieverOpenAIAgent": "llama_index.agent.openai_legacy",
-  "ContextRetrieverOpenAIAgent": "llama_index.agent.openai_legacy",
   "PostgresKVStore": "llama_index.storage.kvstore.postgres",
   "RedisKVStore": "llama_index.storage.kvstore.redis",
   "FirestoreKVStore": "llama_index.storage.kvstore.firestore",
@@ -531,10 +582,9 @@
   "AugmentationPrecisionEvaluator": "llama_index.evaluation.tonic_validate",
   "RetrievalPrecisionEvaluator": "llama_index.evaluation.tonic_validate",
   "TonicValidateEvaluator": "llama_index.evaluation.tonic_validate",
-  "BaseReader": "llama_index.core.readers.base",
+  "LlamaParse": "llama_index.readers.llama_parse",
   "DocugamiReader": "llama_index.readers.docugami",
   "SlackReader": "llama_index.readers.slack",
-  "GeniusReader": "llama_index.readers.genius",
   "YoutubeTranscriptReader": "llama_index.readers.youtube_transcript",
   "MboxReader": "llama_index.readers.mbox",
   "StackoverflowReader": "llama_index.readers.stackoverflow",
@@ -543,7 +593,6 @@
   "DiscordReader": "llama_index.readers.discord",
   "EarningsCallTranscript": "llama_index.readers.earnings_call_transcript",
   "SimpleCouchDBReader": "llama_index.readers.couchdb",
-  "CouchbaseReader": "llama_index.readers.couchbase",
   "SingleStoreReader": "llama_index.readers.singlestore",
   "JSONReader": "llama_index.readers.json",
   "TrelloReader": "llama_index.readers.trello",
@@ -564,9 +613,9 @@
   "OpendalS3Reader": "llama_index.readers.opendal",
   "AzStorageBlobReader": "llama_index.readers.azstorage_blob",
   "ReadwiseReader": "llama_index.readers.readwise",
+  "GeniusReader": "llama_index.readers.genius",
   "ApifyActor": "llama_index.readers.apify",
   "ApifyDataset": "llama_index.readers.apify",
-  "SimpleArangoDBReader": "llama_index.readers.arango_db",
   "AthenaReader": "llama_index.readers.athena",
   "DatabaseReader": "llama_index.readers.database",
   "RemoteReader": "llama_index.readers.remote",
@@ -578,6 +627,7 @@
   "MilvusReader": "llama_index.readers.milvus",
   "PDFNougatOCR": "llama_index.readers.nougat_ocr",
   "AssemblyAIAudioTranscriptReader": "llama_index.readers.assemblyai",
+  "TranscriptFormat": "llama_index.readers.assemblyai",
   "GraphDBCypherReader": "llama_index.readers.graphdb_cypher",
   "ConfluenceReader": "llama_index.readers.confluence",
   "LilacReader": "llama_index.readers.lilac",
@@ -590,8 +640,6 @@
   "SimpleMongoReader": "llama_index.readers.mongodb",
   "NotionPageReader": "llama_index.readers.notion",
   "WordpressReader": "llama_index.readers.wordpress",
-  "XMLReader": "llama_index.readers.file",
-  "PagedCSVReader": "llama_index.readers.file",
   "AirbyteTypeformReader": "llama_index.readers.airbyte_typeform",
   "AirbyteZendeskSupportReader": "llama_index.readers.airbyte_zendesk_support",
   "FirestoreReader": "llama_index.readers.firestore",
@@ -609,6 +657,7 @@
   "FirebaseRealtimeDatabaseReader": "llama_index.readers.firebase_realtimedb",
   "RemoteDepthReader": "llama_index.readers.remote_depth",
   "MakeWrapper": "llama_index.readers.make_com",
+  "SimpleArangoDBReader": "llama_index.readers.arango_db",
   "MangaDexReader": "llama_index.readers.mangadex",
   "IntercomReader": "llama_index.readers.intercom",
   "AirbyteGongReader": "llama_index.readers.airbyte_gong",
@@ -640,6 +689,7 @@
   "GmailReader": "llama_index.readers.google",
   "GoogleKeepReader": "llama_index.readers.google",
   "FeishuDocsReader": "llama_index.readers.feishu_docs",
+  "CouchbaseReader": "llama_index.readers.couchbase",
   "OpenAlexReader": "llama_index.readers.openalex",
   "TxtaiReader": "llama_index.readers.txtai",
   "AzCognitiveSearchReader": "llama_index.readers.azcognitive_search",
@@ -665,8 +715,10 @@
   "HubspotReader": "llama_index.readers.hubspot",
   "DocxReader": "llama_index.readers.file",
   "HWPReader": "llama_index.readers.file",
+  "PDFReader": "llama_index.readers.file",
   "EpubReader": "llama_index.readers.file",
   "FlatReader": "llama_index.readers.file",
+  "HTMLTagReader": "llama_index.readers.file",
   "ImageCaptionReader": "llama_index.readers.file",
   "ImageReader": "llama_index.readers.file",
   "ImageVisionLLMReader": "llama_index.readers.file",
@@ -678,7 +730,9 @@
   "UnstructuredReader": "llama_index.readers.file",
   "PyMuPDFReader": "llama_index.readers.file",
   "ImageTabularChartReader": "llama_index.readers.file",
-  "CSVReader": "llama_index.readers.file.tabular",
+  "XMLReader": "llama_index.readers.file",
+  "PagedCSVReader": "llama_index.readers.file",
+  "CSVReader": "llama_index.readers.file",
   "KalturaESearchReader": "llama_index.readers.kaltura_esearch",
   "AwadbReader": "llama_index.readers.awadb",
   "IMDBReviews": "llama_index.readers.imdb_review",
@@ -706,26 +760,31 @@
   "ChromaReader": "llama_index.readers.chroma",
   "WeatherReader": "llama_index.readers.weather",
   "ChatGPTRetrievalPluginReader": "llama_index.readers.chatgpt_plugin",
+  "ClickHouseReader": "llama_index.readers.clickhouse",
   "MetalReader": "llama_index.readers.metal",
   "BoardDocsReader": "llama_index.readers.boarddocs",
   "GuidanceQuestionGenerator": "llama_index.question_gen.guidance",
   "OpenAIQuestionGenerator": "llama_index.question_gen.openai",
   "PaLM": "llama_index.llms.palm",
-  "DashScope": "llama_index.llms.dashscope",
-  "DashScopeGenerationModels": "llama_index.llms.dashscope",
   "WatsonX": "llama_index.llms.watsonx",
   "Cohere": "llama_index.llms.cohere",
   "NvidiaTriton": "llama_index.llms.nvidia_triton",
   "AI21": "llama_index.llms.ai21",
   "Bedrock": "llama_index.llms.bedrock",
+  "completion_with_retry": "llama_index.llms.bedrock",
+  "completion_response_to_chat_response": "llama_index.llms.bedrock",
   "HuggingFaceLLM": "llama_index.llms.huggingface",
   "HuggingFaceInferenceAPI": "llama_index.llms.huggingface",
-  "AzureOpenAI": "llama_index.llms.azure_openai",
+  "SyncAzureOpenAI": "llama_index.llms.azure_openai",
+  "DashScope": "llama_index.llms.dashscope",
+  "DashScopeGenerationModels": "llama_index.llms.dashscope",
   "LocalTensorRTLLM": "llama_index.llms.nvidia_tensorrt",
   "Anthropic": "llama_index.llms.anthropic",
   "Gemini": "llama_index.llms.gemini",
+  "Friendli": "llama_index.llms.friendli",
   "Clarifai": "llama_index.llms.clarifai",
   "LlamaAPI": "llama_index.llms.llama_api",
+  "MyMagicAI": "llama_index.llms.mymagic",
   "LlamaCPP": "llama_index.llms.llama_cpp",
   "Perplexity": "llama_index.llms.perplexity",
   "RunGptLLM": "llama_index.llms.rungpt",
@@ -738,10 +797,14 @@
   "SageMakerLLM": "llama_index.llms.sagemaker_endpoint",
   "Portkey": "llama_index.llms.portkey",
   "Vllm": "llama_index.llms.vllm",
+  "VllmServer": "llama_index.llms.vllm",
+  "Maritalk": "llama_index.llms.maritalk",
+  "Groq": "llama_index.llms.groq",
   "Neutrino": "llama_index.llms.neutrino",
   "MonsterLLM": "llama_index.llms.monsterapi",
   "PredibaseLLM": "llama_index.llms.predibase",
   "Xinference": "llama_index.llms.xinference",
+  "Fireworks": "llama_index.llms.fireworks",
   "MistralAI": "llama_index.llms.mistralai",
   "Anyscale": "llama_index.llms.anyscale",
   "Vertex": "llama_index.llms.vertex",
@@ -753,17 +816,17 @@
   "OpenRouter": "llama_index.llms.openrouter",
   "OpenAI": "llama_index.llms.openai",
   "Tokenizer": "llama_index.llms.openai",
+  "SyncOpenAI": "llama_index.llms.openai",
+  "AsyncOpenAI": "llama_index.llms.openai",
   "GradientBaseModelLLM": "llama_index.llms.gradient",
   "GradientModelAdapterLLM": "llama_index.llms.gradient",
-  "Friendli": "llama_index.llms.friendli",
   "EntityExtractor": "llama_index.extractors.entity",
   "MarvinMetadataExtractor": "llama_index.extractors.marvin",
   "WeaviateRetryEnginePack": "llama_index.packs.retry_engine_weaviate",
   "LlavaCompletionPack": "llama_index.packs.llava_completion",
-  "VannaPack": "llama_index.packs.vanna",
-  "VannaQueryEngine": "llama_index.packs.vanna",
   "ZephyrQueryEnginePack": "llama_index.packs.zephyr_query_engine",
   "TimescaleVectorAutoretrievalPack": "llama_index.packs.timescale_vector_autoretrieval",
+  "CorrectiveRAGPack": "llama_index.packs.corrective_rag",
   "MultiDocumentAgentsPack": "llama_index.packs.multi_document_agents",
   "MultiDocAutoRetrieverPack": "llama_index.packs.multidoc_autoretrieval",
   "GmailOpenAIAgentPack": "llama_index.packs.gmail_openai_agent",
@@ -774,33 +837,37 @@
   "TruLensHarmlessPack": "llama_index.packs.trulens_eval_packs",
   "TruLensHelpfulPack": "llama_index.packs.trulens_eval_packs",
   "EvaluatorBenchmarkerPack": "llama_index.packs.evaluator_benchmarker",
+  "VannaPack": "llama_index.packs.vanna",
+  "VannaQueryEngine": "llama_index.packs.vanna",
   "RAGFusionPipelinePack": "llama_index.packs.rag_fusion_query_pipeline",
   "LlamaGuardModeratorPack": "llama_index.packs.llama_guard_moderator",
   "SnowflakeQueryEnginePack": "llama_index.packs.snowflake_query_engine",
+  "SelfRAGPack": "llama_index.packs.self_rag",
+  "SelfRAGQueryEngine": "llama_index.packs.self_rag",
+  "SelfDiscoverPack": "llama_index.packs.self_discover",
   "LlamaDatasetMetadataPack": "llama_index.packs.llama_dataset_metadata",
   "StockMarketDataQueryEnginePack": "llama_index.packs.stock_market_data_query_engine",
   "RagEvaluatorPack": "llama_index.packs.rag_evaluator",
   "ArizePhoenixQueryEnginePack": "llama_index.packs.arize_phoenix_query_engine",
   "PanelChatPack": "llama_index.packs.panel_chatbot",
+  "LocalRAGCLIPack": "llama_index.packs.rag_cli_local",
   "MultiTenancyRAGPack": "llama_index.packs.multi_tenancy_rag",
   "StreamlitChatPack": "llama_index.packs.streamlit_chatbot",
   "VectaraRagPack": "llama_index.packs.vectara_rag",
-  "ChainOfTablePack": "llama_index.packs.tables",
-  "MixSelfConsistencyPack": "llama_index.packs.tables",
-  "SelfRAGPack": "llama_index.packs.self_rag",
-  "SelfRAGQueryEngine": "llama_index.packs.self_rag",
   "SemanticChunkingQueryEnginePack": "llama_index.packs.node_parser_semantic_chunking",
   "RedisIngestionPipelinePack": "llama_index.packs.redis_ingestion_pipeline",
   "DenseXRetrievalPack": "llama_index.packs.dense_x_retrieval",
-  "LocalRAGCLIPack": "llama_index.packs.rag_cli_local",
-  "InferRetrieveRerankPack": "llama_index.packs.infer_retrieve_rerank",
-  "AutoMergingRetrieverPack": "llama_index.packs.auto_merging_retriever",
   "LLMCompilerAgentPack": "llama_index.packs.agents_llm_compiler",
   "GradioReActAgentPack": "llama_index.packs.gradio_react_agent_chatbot",
   "WeaviateSubQuestionPack": "llama_index.packs.sub_question_weaviate",
   "DeepMemoryRetrieverPack": "llama_index.packs.deeplake_deepmemory_retriever",
   "NebulaGraphQueryEnginePack": "llama_index.packs.nebulagraph_query_engine",
   "VoyageQueryEnginePack": "llama_index.packs.voyage_query_engine",
+  "InferRetrieveRerankPack": "llama_index.packs.infer_retrieve_rerank",
+  "KodaRetriever": "llama_index.packs.koda_retriever",
+  "AlphaMatrix": "llama_index.packs.koda_retriever",
+  "DEFAULT_CATEGORIES": "llama_index.packs.koda_retriever",
+  "SubDocSummaryPack": "llama_index.packs.subdoc_summary",
   "SentenceWindowRetrieverPack": "llama_index.packs.sentence_window_retriever",
   "EmbeddedTablesUnstructuredRetrieverPack": "llama_index.packs.recursive_retriever",
   "RecursiveRetrieverSmallToBigPack": "llama_index.packs.recursive_retriever",
@@ -825,9 +892,5 @@
   "get_eval_results": "llama_index.core.evaluation.eval_utils",
   "VectorStoreInfo": "llama_index.core.vector_stores",
   "MetadataInfo": "llama_index.core.vector_stores",
-  "UpstashVectorStore": "llama_index.vector_stores.upstash",
-  "AzureAISearchVectorStore": "llama_index.vector_stores.azureaisearch",
-  "CognitiveSearchVectorStore": "llama_index.vector_stores.azureaisearch",
-  "IndexManagement": "llama_index.vector_stores.azureaisearch",
   "REPLICATE_MULTI_MODAL_LLM_MODELS": "llama_index.multi_modal_llms.replicate.base"
 }